[MERGE] forward port of branch 7.0 up to 6e23b2a
This commit is contained in:
commit
e2bfb969ed
|
@ -51,8 +51,8 @@ class account_statement_from_invoice_lines(osv.osv_memory):
|
||||||
currency_obj = self.pool.get('res.currency')
|
currency_obj = self.pool.get('res.currency')
|
||||||
voucher_obj = self.pool.get('account.voucher')
|
voucher_obj = self.pool.get('account.voucher')
|
||||||
voucher_line_obj = self.pool.get('account.voucher.line')
|
voucher_line_obj = self.pool.get('account.voucher.line')
|
||||||
line_date = time.strftime('%Y-%m-%d')
|
|
||||||
statement = statement_obj.browse(cr, uid, statement_id, context=context)
|
statement = statement_obj.browse(cr, uid, statement_id, context=context)
|
||||||
|
line_date = statement.date
|
||||||
|
|
||||||
# for each selected move lines
|
# for each selected move lines
|
||||||
for line in line_obj.browse(cr, uid, line_ids, context=context):
|
for line in line_obj.browse(cr, uid, line_ids, context=context):
|
||||||
|
|
|
@ -998,7 +998,7 @@ class ir_model_data(osv.osv):
|
||||||
|
|
||||||
if action_id and res_id:
|
if action_id and res_id:
|
||||||
model_obj.write(cr, uid, [res_id], values, context=context)
|
model_obj.write(cr, uid, [res_id], values, context=context)
|
||||||
self.write(cr, uid, [action_id], {
|
self.write(cr, SUPERUSER_ID, [action_id], {
|
||||||
'date_update': time.strftime('%Y-%m-%d %H:%M:%S'),
|
'date_update': time.strftime('%Y-%m-%d %H:%M:%S'),
|
||||||
},context=context)
|
},context=context)
|
||||||
elif res_id:
|
elif res_id:
|
||||||
|
@ -1008,14 +1008,14 @@ class ir_model_data(osv.osv):
|
||||||
for table in model_obj._inherits:
|
for table in model_obj._inherits:
|
||||||
inherit_id = model_obj.browse(cr, uid,
|
inherit_id = model_obj.browse(cr, uid,
|
||||||
res_id,context=context)[model_obj._inherits[table]]
|
res_id,context=context)[model_obj._inherits[table]]
|
||||||
self.create(cr, uid, {
|
self.create(cr, SUPERUSER_ID, {
|
||||||
'name': xml_id + '_' + table.replace('.', '_'),
|
'name': xml_id + '_' + table.replace('.', '_'),
|
||||||
'model': table,
|
'model': table,
|
||||||
'module': module,
|
'module': module,
|
||||||
'res_id': inherit_id.id,
|
'res_id': inherit_id.id,
|
||||||
'noupdate': noupdate,
|
'noupdate': noupdate,
|
||||||
},context=context)
|
},context=context)
|
||||||
self.create(cr, uid, {
|
self.create(cr, SUPERUSER_ID, {
|
||||||
'name': xml_id,
|
'name': xml_id,
|
||||||
'model': model,
|
'model': model,
|
||||||
'module':module,
|
'module':module,
|
||||||
|
@ -1030,14 +1030,14 @@ class ir_model_data(osv.osv):
|
||||||
for table in model_obj._inherits:
|
for table in model_obj._inherits:
|
||||||
inherit_id = model_obj.browse(cr, uid,
|
inherit_id = model_obj.browse(cr, uid,
|
||||||
res_id,context=context)[model_obj._inherits[table]]
|
res_id,context=context)[model_obj._inherits[table]]
|
||||||
self.create(cr, uid, {
|
self.create(cr, SUPERUSER_ID, {
|
||||||
'name': xml_id + '_' + table.replace('.', '_'),
|
'name': xml_id + '_' + table.replace('.', '_'),
|
||||||
'model': table,
|
'model': table,
|
||||||
'module': module,
|
'module': module,
|
||||||
'res_id': inherit_id.id,
|
'res_id': inherit_id.id,
|
||||||
'noupdate': noupdate,
|
'noupdate': noupdate,
|
||||||
},context=context)
|
},context=context)
|
||||||
self.create(cr, uid, {
|
self.create(cr, SUPERUSER_ID, {
|
||||||
'name': xml_id,
|
'name': xml_id,
|
||||||
'model': model,
|
'model': model,
|
||||||
'module': module,
|
'module': module,
|
||||||
|
|
Loading…
Reference in New Issue