[FIX] account: fixed incorrect calls to _(..) function

[odoo/odoo.git] / addons / account / wizard / account_use_model.py

diff --git a/addons/account/wizard/account_use_model.py b/addons/account/wizard/account_use_model.py
index 6cadb4b..51bd3a9 100644 (file)
--- a/addons/account/wizard/account_use_model.py
+++ b/addons/account/wizard/account_use_model.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 import time
-import datetime
 
 from osv import fields, osv
 from tools.translate import _
@@ -31,7 +30,7 @@ class account_use_model(osv.osv_memory):
     _columns = {
         'model': fields.many2many('account.model', 'account_use_model_relation', 'account_id', 'model_id', 'Account Model'),
     }
-    
+
     def view_init(self, cr , uid , fields_list, context=None):
         account_model_obj = self.pool.get('account.model')
         if context is None:
@@ -42,8 +41,8 @@ class account_use_model(osv.osv_memory):
                 for line in model.lines_id:
                     if line.date_maturity == 'partner':
                         if not line.partner_id:
-                            raise osv.except_osv(_('Error !'), _("Maturity date of entry line generated by model line '%s' is based on partner payment term! \
-                                                    \nPlease define partner on it!"%(line.name)))
+                            raise osv.except_osv(_('Error !'), _("Maturity date of entry line generated by model line '%s' is based on partner payment term!"\
+                                                                    "\nPlease define partner on it!")%line.name)
         pass
 
     def create_entries(self, cr, uid, ids, context=None):
@@ -55,21 +54,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.ref,
+                'ref': entry['name'],
                 'period_id': period_id,
                 'journal_id': model.journal_id.id,
             })
@@ -101,7 +101,6 @@ class account_use_model(osv.osv_memory):
                     'credit': line.credit,
                     'account_id': line.account_id.id,
                     'move_id': move_id,
-                    'ref': line.ref,
                     'partner_id': line.partner_id.id,
                     'date': time.strftime('%Y-%m-%d'),
                     'date_maturity': date_maturity
@@ -109,7 +108,7 @@ class account_use_model(osv.osv_memory):
                 c = context.copy()
                 c.update({'journal_id': model.journal_id.id,'period_id': period_id})
                 id_line = account_move_line_obj.create(cr, uid, val, context=c)
-    
+
         context.update({'move_ids':move_ids})
         model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_move_form')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
@@ -125,4 +124,4 @@ class account_use_model(osv.osv_memory):
 
 account_use_model()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: