Merge lp:~agilebg/account-financial-tools/7.0-add_account_invoice_template_fixes into lp:~bruno-bottacini/account-financial-tools/7.0-add_account_invoice_template

[Lorenzo Battistini]

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Hello,

Thanks for the patch.

The diff looks good to me.

That said the module needs a general cleanup and review.

There is some oddities here and there and
a simple pass of the wizard file on flake 8 gave the following output:

select_template.py:3:2:warning: W291 trailing whitespace (python-flake8)
select_template.py:22:31:error: E231 missing whitespace after ',' (python-flake8)
select_template.py:23:1:warning: F401 'time' imported but unused (python-flake8)
select_template.py:26:1:error: E302 expected 2 blank lines, found 1 (python-flake8)
select_template.py:30:101:error: E501 line too long (102 > 100 characters) (python-flake8)
select_template.py:33:33:error: E231 missing whitespace after ',' (python-flake8)
select_template.py:38:17:error: E222 multiple spaces after operator (python-flake8)
select_template.py:46:48:error: E231 missing whitespace after ',' (python-flake8)
select_template.py:58:101:error: E501 line too long (117 > 100 characters) (python-flake8)
select_template.py:62:12:error: E121 continuation line indentation is not a multiple of four (python-flake8)
select_template.py:63:21:error: E203 whitespace before ':' (python-flake8)
select_template.py:76:1:warning: F841 local variable 'template_line_obj' is assigned to but never used (python-flake8)
select_template.py:77:1:warning: F841 local variable 'account_period_obj' is assigned to but never used (python-flake8)
select_template.py:81:1:warning: F841 local variable 'entry' is assigned to but never used (python-flake8)
select_template.py:83:17:error: E222 multiple spaces after operator (python-flake8)
select_template.py:105:24:error: E225 missing whitespace around operator (python-flake8)
select_template.py:108:46:error: E231 missing whitespace after ',' (python-flake8)
select_template.py:118:1:warning: F841 local variable 'id_line' is assigned to but never used (python-flake8)
select_template.py:132:35:error: E231 missing whitespace after ',' (python-flake8)
select_template.py:150:1:warning: W391 blank line at end of file (python-flake8)

Keep up the good work.

Regards

Nicolas

review: Approve (no test, code review)

[lp:~agilebg/account-financial-tools/7.0-add_account_invoice_template_fixes]

117. By Lorenzo Battistini on 2013-09-26

[IMP] PEP8

[Lorenzo Battistini (elbati)]

Hello Nicolas,
just made the changes, thanks.

[bruno bottacini (bruno-bottacini)]

review: Approve

=== modified file 'account_invoice_template/__init__.py'
--- account_invoice_template/__init__.py	2013-06-18 07:33:16 +0000
+++ account_invoice_template/__init__.py	2013-09-26 08:59:58 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
 #    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
 #

=== modified file 'account_invoice_template/__openerp__.py'
--- account_invoice_template/__openerp__.py	2013-06-18 07:33:16 +0000
+++ account_invoice_template/__openerp__.py	2013-09-26 08:59:58 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
 #    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
 #
@@ -26,14 +26,17 @@
 Templates for Invoices
 
 User can configure invoice templates, useful for recurring invoices.
-The amount of each template line can be computed (through python code) or kept as user input. If user input, when using the template, user has to fill the amount of every input lines.
-The invoice form allows lo load, through a wizard, the template to use and the amounts to fill.
+The amount of each template line can be computed (through python code)
+or kept as user input. If user input, when using the template, user has to fill
+the amount of every input lines.
+The invoice form allows lo load, through a wizard, the template to use and the
+amounts to fill.
 """,
     'author': 'Agile Business Group',
     'website': 'http://www.agilebg.com',
     'license': 'AGPL-3',
-    "depends" : ['account_move_template'],
-    "data" : [
+    "depends": ['account_move_template'],
+    "data": [
         'invoice_template.xml',
         'wizard/select_template.xml',
         'security/ir.model.access.csv',

=== modified file 'account_invoice_template/account_invoice_template.py'
--- account_invoice_template/account_invoice_template.py	2013-06-18 07:33:16 +0000
+++ account_invoice_template/account_invoice_template.py	2013-09-26 08:59:58 +0000
@@ -20,7 +20,7 @@
 ##############################################################################
 
 from openerp.osv import fields, orm
-from openerp.tools.translate import _
+
 
 class account_invoice_template(orm.Model):
 
@@ -30,13 +30,14 @@
     _columns = {
         'partner_id': fields.many2one('res.partner', 'Partner', required=True),
         'account_id': fields.many2one('account.account', 'Account', required=True),
-        'template_line_ids': fields.one2many('account.invoice.template.line', 'template_id', 'Template Lines'),
+        'template_line_ids': fields.one2many('account.invoice.template.line',
+            'template_id', 'Template Lines'),
         'type': fields.selection([
-            ('out_invoice','Customer Invoice'),
-            ('in_invoice','Supplier Invoice'),
-            ('out_refund','Customer Refund'),
-            ('in_refund','Supplier Refund'),
-            ],'Type', required=True ),
+            ('out_invoice', 'Customer Invoice'),
+            ('in_invoice', 'Supplier Invoice'),
+            ('out_refund', 'Customer Refund'),
+            ('in_refund', 'Supplier Refund'),
+            ], 'Type', required=True),
         }
 
 
@@ -46,15 +47,21 @@
     _inherit = 'account.document.template.line'
 
     _columns = {
-        'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')]),
-        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', ondelete="cascade"),
-        'invoice_line_tax_id': fields.many2many('account.tax', 'account_invoice_template_line_tax', 'invoice_line_id', 'tax_id', 'Taxes', domain=[('parent_id','=',False)]),
-        'template_id': fields.many2one('account.invoice.template', 'Template', ondelete='cascade'),
+        'account_id': fields.many2one('account.account', 'Account',
+            required=True, domain=[('type', '<>', 'view'), ('type', '<>', 'closed')]),
+        'analytic_account_id': fields.many2one('account.analytic.account',
+            'Analytic Account', ondelete="cascade"),
+        'invoice_line_tax_id': fields.many2many('account.tax',
+            'account_invoice_template_line_tax', 'invoice_line_id', 'tax_id',
+            'Taxes', domain=[('parent_id', '=', False)]),
+        'template_id': fields.many2one('account.invoice.template', 'Template',
+            ondelete='cascade'),
         'product_id': fields.many2one('product.product', 'Product'),
         }
 
     _sql_constraints = [
-        ('sequence_template_uniq', 'unique (template_id,sequence)', 'The sequence of the line must be unique per template !')
+        ('sequence_template_uniq', 'unique (template_id,sequence)',
+            'The sequence of the line must be unique per template !')
     ]
 
     def product_id_change(self, cr, uid, ids, product_id, type, context=None):
@@ -65,14 +72,15 @@
         if not product_id:
             return {}
 
-        product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        product = self.pool.get('product.product').browse(cr, uid, product_id,
+            context=context)
 
         # name
         result.update({'name': product.name})
 
         # account
         account_id = False
-        if type in ('out_invoice','out_refund'):
+        if type in ('out_invoice', 'out_refund'):
             account_id = product.product_tmpl_id.property_account_income.id
             if not account_id:
                 account_id = product.categ_id.property_account_income_categ.id
@@ -96,4 +104,3 @@
         result.update({'invoice_line_tax_id': tax_ids})
 
         return {'value': result}
-

=== modified file 'account_invoice_template/wizard/select_template.py'
--- account_invoice_template/wizard/select_template.py	2013-06-18 13:59:38 +0000
+++ account_invoice_template/wizard/select_template.py	2013-09-26 08:59:58 +0000
@@ -19,91 +19,97 @@
 #
 ##############################################################################
 
-from openerp.osv import fields,orm
-import time
+from openerp.osv import fields, orm
 from openerp.tools.translate import _
 
+
 class wizard_select_template(orm.TransientModel):
 
     _name = "wizard.select.invoice.template"
     _columns = {
-        'template_id': fields.many2one('account.invoice.template', 'Invoice Template', required=True),
-        'line_ids': fields.one2many('wizard.select.invoice.template.line', 'template_id', 'Lines'),
+        'template_id': fields.many2one('account.invoice.template',
+            'Invoice Template', required=True),
+        'line_ids': fields.one2many('wizard.select.invoice.template.line',
+            'template_id', 'Lines'),
         'state': fields.selection([
-            ('template_selected','Template selected'),
+            ('template_selected', 'Template selected'),
             ], 'State'),
     }
 
     def load_lines(self, cr, uid, ids, context=None):
-        wizard =  self.browse(cr, uid, ids, context=context)[0]
+        wizard = self.browse(cr, uid, ids, context=context)[0]
         template_pool = self.pool.get('account.invoice.template')
         wizard_line_pool = self.pool.get('wizard.select.invoice.template.line')
         model_data_obj = self.pool.get('ir.model.data')
 
-        template = template_pool.browse(cr, uid, wizard.template_id.id)
+        template = template_pool.browse(cr, uid, wizard.template_id.id,
+            context=context)
         for line in template.template_line_ids:
             if line.type == 'input':
-                wizard_line_pool.create(cr, uid,{
+                wizard_line_pool.create(cr, uid, {
                     'template_id': wizard.id,
                     'sequence': line.sequence,
                     'name': line.name,
                     'amount': line.product_id and line.product_id.list_price or 0.0,
                     'account_id': line.account_id.id,
                     'product_id': line.product_id.id,
-                    })
+                    }, context=context)
         if not wizard.line_ids:
-            return self.load_template(cr, uid, ids)
-        wizard.write({'state': 'template_selected'})
+            return self.load_template(cr, uid, ids, context=context)
+        wizard.write({'state': 'template_selected'}, context=context)
 
-        view_rec = model_data_obj.get_object_reference(cr, uid, 'account_invoice_template', 'wizard_select_template')
+        view_rec = model_data_obj.get_object_reference(cr, uid,
+            'account_invoice_template', 'wizard_select_template')
         view_id = view_rec and view_rec[1] or False
 
         return {
-           'view_type': 'form',
-           'view_id' : [view_id],
-           'view_mode': 'form',
-           'res_model': 'wizard.select.invoice.template',
-           'res_id': wizard.id,
-           'type': 'ir.actions.act_window',
-           'target': 'new',
-           'context': context,
+            'view_type': 'form',
+            'view_id': [view_id],
+            'view_mode': 'form',
+            'res_model': 'wizard.select.invoice.template',
+            'res_id': wizard.id,
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'context': context,
         }
 
     def load_template(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         template_obj = self.pool.get('account.invoice.template')
-        template_line_obj = self.pool.get('account.invoice.template.line')
-        account_period_obj = self.pool.get('account.period')
         account_invoice_obj = self.pool.get('account.invoice')
         account_invoice_line_obj = self.pool.get('account.invoice.line')
         mod_obj = self.pool.get('ir.model.data')
-        entry = {}
 
-        wizard =  self.browse(cr, uid, ids, context=context)[0]
+        wizard = self.browse(cr, uid, ids, context=context)[0]
         if not template_obj.check_zero_lines(cr, uid, wizard):
-            raise orm.except_orm(_('Error !'), _('At least one amount has to be non-zero!'))
+            raise orm.except_orm(_('Error !'),
+                _('At least one amount has to be non-zero!'))
         input_lines = {}
         for template_line in wizard.line_ids:
             input_lines[template_line.sequence] = template_line.amount
 
-        computed_lines = template_obj.compute_lines(cr, uid, wizard.template_id.id, input_lines)
+        computed_lines = template_obj.compute_lines(cr, uid,
+            wizard.template_id.id, input_lines)
 
         inv_values = account_invoice_obj.onchange_partner_id(
-            cr, uid, ids, wizard.template_id.type, wizard.template_id.partner_id.id)['value']
+            cr, uid, ids, wizard.template_id.type,
+            wizard.template_id.partner_id.id)['value']
         inv_values['partner_id'] = wizard.template_id.partner_id.id
         inv_values['account_id'] = wizard.template_id.account_id.id
         inv_values['type'] = wizard.template_id.type
-
-        inv_id = account_invoice_obj.create(cr, uid, inv_values, context={'type':wizard.template_id.type})
+        context['type'] = wizard.template_id.type
+        inv_id = account_invoice_obj.create(cr, uid, inv_values, context=context)
         for line in wizard.template_id.template_line_ids:
             analytic_account_id = False
             if line.analytic_account_id:
                 analytic_account_id = line.analytic_account_id.id
             invoice_line_tax_id = []
             if line.invoice_line_tax_id:
-                tax_ids=[]
+                tax_ids = []
                 for tax in line.invoice_line_tax_id:
                     tax_ids.append(tax.id)
-                invoice_line_tax_id.append((6,0, tax_ids))
+                invoice_line_tax_id.append((6, 0, tax_ids))
             val = {
                 'name': line.name,
                 'invoice_id': inv_id,
@@ -113,7 +119,7 @@
                 'price_unit': computed_lines[line.sequence],
                 'product_id': line.product_id.id,
             }
-            id_line = account_invoice_line_obj.create(cr, uid, val)
+            account_invoice_line_obj.create(cr, uid, val, context=context)
 
         if wizard.template_id.type in ('out_invoice', 'out_refund'):
             xml_id = 'invoice_form'
@@ -122,12 +128,12 @@
         resource_id = mod_obj.get_object_reference(cr, uid, 'account', xml_id)[1]
 
         return {
-            'domain': "[('id','in', ["+str(inv_id)+"])]",
+            'domain': "[('id','in', [" + str(inv_id) + "])]",
             'name': 'Invoice',
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'account.invoice',
-            'views': [(resource_id,'form')],
+            'views': [(resource_id, 'form')],
             'type': 'ir.actions.act_window',
             'target': 'current',
             'res_id': inv_id or False,
@@ -141,8 +147,8 @@
         'template_id': fields.many2one('wizard.select.invoice.template', 'Template'),
         'sequence': fields.integer('Number', required=True),
         'name': fields.char('Name', size=64, required=True, readonly=True),
-        'account_id': fields.many2one('account.account', 'Account', required=True, readonly=True),
+        'account_id': fields.many2one('account.account', 'Account',
+            required=True, readonly=True),
         'amount': fields.float('Amount', required=True),
         'product_id': fields.many2one('product.product', 'Product'),
     }
-