odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] account:replace the %(year)s, %(month), %(day) with current datetime info for recurring entries 

bzr revid: psi@tinyerp.co.in-20100909051601-0fnvcn3ml5k4ilp2
This commit is contained in:
psi (Open ERP) 2010-09-09 10:46:01 +05:30
parent 84d412dd02
commit 4f50060561
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/account.py
View File

@ -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'))

7
addons/account/wizard/account_use_model.py
View File

@ -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,
})