diff options
| author | Olivier Dony <odo@openerp.com> | 2016-05-05 03:54:44 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2016-05-05 03:55:24 +0200 |
| commit | d2f02ff1b1e0eff0630085b3be6d07f8fef94dfd (patch) | |
| tree | 10c51c7436d97c823e1ac152c9bb5eff5e58d493 /addons | |
| parent | 19d62ec5a785be4bf19212794d4b9e36698c0578 (diff) | |
| parent | c8dc4c8daf8a3a2f8e52448c164a30d3cbeb524c (diff) | |
[MERGE] Forward-port 8.0 up to c8dc4c8daf8a3a2f8e52448c164a30d3cbeb524c
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/account/partner.py | 4 | ||||
| -rw-r--r-- | addons/purchase/purchase.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/addons/account/partner.py b/addons/account/partner.py index 1f1c73ce371..40d8702de16 100644 --- a/addons/account/partner.py +++ b/addons/account/partner.py @@ -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."), diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 1f2451f40d4..215efa4c790 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -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): |