From 4f50060561e54a527963e5d486fd597dfabcdc0f Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Thu, 9 Sep 2010 10:46:01 +0530 Subject: [PATCH] [IMP] account:replace the %(year)s, %(month), %(day) with current datetime info for recurring entries bzr revid: psi@tinyerp.co.in-20100909051601-0fnvcn3ml5k4ilp2 --- addons/account/account.py | 4 +++- addons/account/wizard/account_use_model.py | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index e4c70fd398e..35302850b51 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2014,6 +2014,7 @@ class account_model(osv.osv): } def generate(self, cr, uid, ids, datas={}, context={}): move_ids = [] + entry = {} account_move_obj = self.pool.get('account.move') account_move_line_obj = self.pool.get('account.move.line') pt_obj = self.pool.get('account.payment.term') @@ -2027,8 +2028,9 @@ class account_model(osv.osv): period_id = period_id[0] for model in self.browse(cr, uid, ids, context): + entry['name'] = model.name%{'year':time.strftime('%Y'), 'month':time.strftime('%m'), 'date':time.strftime('%d')} move_id = account_move_obj.create(cr, uid, { - 'ref': model.name, + 'ref': entry['name'], 'period_id': period_id, 'journal_id': model.journal_id.id, 'date': context.get('date',time.strftime('%Y-%m-%d')) diff --git a/addons/account/wizard/account_use_model.py b/addons/account/wizard/account_use_model.py index b1087cbbcdc..edac082f32e 100644 --- a/addons/account/wizard/account_use_model.py +++ b/addons/account/wizard/account_use_model.py @@ -55,21 +55,22 @@ class account_use_model(osv.osv_memory): mod_obj = self.pool.get('ir.model.data') if context is None: context = {} - + move_ids = [] + entry = {} data = self.read(cr, uid, ids, context=context)[0] record_id = context and context.get('model_line', False) or False if record_id: data_model = account_model_obj.browse(cr, uid, data['model']) else: data_model = account_model_obj.browse(cr, uid, context['active_ids']) - move_ids = [] for model in data_model: + entry['name'] = model.name%{'year':time.strftime('%Y'), 'month':time.strftime('%m'), 'date':time.strftime('%d')} period_id = account_period_obj.find(cr, uid, context=context) if not period_id: raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !')) period_id = period_id[0] move_id = account_move_obj.create(cr, uid, { - 'ref': model.name, + 'ref': entry['name'], 'period_id': period_id, 'journal_id': model.journal_id.id, })