[MERGE] Forward-port 8.0 up to c8dc4c8daf
This commit is contained in:
@@ -22,6 +22,7 @@
|
||||
from operator import itemgetter
|
||||
import time
|
||||
|
||||
from openerp import SUPERUSER_ID
|
||||
from openerp.osv import fields, osv
|
||||
from openerp import api
|
||||
|
||||
@@ -317,7 +318,8 @@ class res_partner(osv.osv):
|
||||
return False
|
||||
|
||||
def mark_as_reconciled(self, cr, uid, ids, context=None):
|
||||
return self.write(cr, uid, ids, {'last_reconciliation_date': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
|
||||
self.pool['account.move.reconcile'].check_access_rights(cr, uid, 'write')
|
||||
return self.write(cr, SUPERUSER_ID, ids, {'last_reconciliation_date': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
|
||||
|
||||
_columns = {
|
||||
'vat_subjected': fields.boolean('VAT Legal Statement', help="Check this box if the partner is subjected to the VAT. It will be used for the VAT legal statement."),
|
||||
|
||||
@@ -574,7 +574,7 @@ class purchase_order(osv.osv):
|
||||
todo.append(line.id)
|
||||
self.pool.get('purchase.order.line').action_confirm(cr, uid, todo, context)
|
||||
for id in ids:
|
||||
self.write(cr, uid, [id], {'state' : 'confirmed', 'validator' : uid})
|
||||
self.write(cr, uid, [id], {'state' : 'confirmed', 'validator' : uid}, context=context)
|
||||
return True
|
||||
|
||||
def _choose_account_from_po_line(self, cr, uid, po_line, context=None):
|
||||
|
||||
Reference in New Issue
Block a user