[MERGE] Forward-port 7.0 up to a0484cbe45
This commit is contained in:
commit
c8dc4c8daf
|
@ -22,6 +22,7 @@
|
||||||
from operator import itemgetter
|
from operator import itemgetter
|
||||||
import time
|
import time
|
||||||
|
|
||||||
|
from openerp import SUPERUSER_ID
|
||||||
from openerp.osv import fields, osv
|
from openerp.osv import fields, osv
|
||||||
from openerp import api
|
from openerp import api
|
||||||
|
|
||||||
|
@ -317,7 +318,8 @@ class res_partner(osv.osv):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def mark_as_reconciled(self, cr, uid, ids, context=None):
|
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 = {
|
_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."),
|
'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."),
|
||||||
|
|
Loading…
Reference in New Issue