Merge lp:~lmi/ocb-addons/7.0-bug1067541 into lp:ocb-addons

[Laurent Mignon (Acsone)]

Automatically derived from https://code.launchpad.net/~lmi/openobject-addons/7.0-bug1067541 for https://code.launchpad.net/~openerp/openobject-addons/trunk.

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks! You may want to move your code down below the check for a valid partner_id on the analytic account in line 41, otherwise you may run into trouble if you try to access its 'lang' in l.31.

review: Needs Fixing

[Laurent Mignon (Acsone) (lmi)]

Thanks for the review!

Code modified according to your review.
(modifications also done on the branch proposed for merge on the official branch)

> Thanks! You may want to move your code down below the check for a valid
> partner_id on the analytic account in line 41, otherwise you may run into
> trouble if you try to access its 'lang' in l.31.

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks for the changes! Looks good to me.

review: Approve

[Stéphane Bidoul (Acsone) (sbi)]

review: Approve (code review)

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2013-05-31 12:19:45 +0000
+++ account/account_invoice_view.xml	2013-08-01 13:22:31 +0000
@@ -345,7 +345,7 @@
                     <field name="sent" invisible="1"/>
                     <notebook colspan="4">
                         <page string="Invoice Lines">
-                            <field name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}">
+                            <field name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type, 'company_id': company_id}">
                                 <tree string="Invoice Lines" editable="bottom">
                                     <field name="product_id"
                                         on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
 
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice.py'
--- hr_timesheet_invoice/hr_timesheet_invoice.py	2013-07-25 10:04:02 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice.py	2013-08-01 13:22:31 +0000
@@ -167,6 +167,7 @@
         fiscal_pos_obj = self.pool.get('account.fiscal.position')
         product_uom_obj = self.pool.get('product.uom')
         invoice_line_obj = self.pool.get('account.invoice.line')
+        res_partner_obj = self.pool.get('res.partner')
         invoices = []
         if context is None:
             context = {}
@@ -183,9 +184,20 @@
         for journal_type, account_ids in journal_types.items():
             for account in analytic_account_obj.browse(cr, uid, list(account_ids), context=context):
                 partner = account.partner_id
+
                 if (not partner) or not (account.pricelist_id):
                     raise osv.except_osv(_('Analytic Account Incomplete!'),
                             _('Contract incomplete. Please fill in the Customer and Pricelist fields.'))
+                context2 = context.copy()
+                context2['lang'] = account.partner_id.lang
+                # set company_id in context, so the correct default journal will be selected
+                # when creating the invoice
+                context2['company_id'] = account.company_id.id
+                # set force_company in context so the correct properties are selected
+                # (eg. income account, receivable account)
+                context2['force_company'] = account.company_id.id
+
+                partner = res_partner_obj.browse(cr, uid, account.partner_id.id, context=context2)
 
                 date_due = False
                 if partner.property_payment_term:
@@ -207,12 +219,6 @@
                     'date_due': date_due,
                     'fiscal_position': account.partner_id.property_account_position.id
                 }
-                context2 = context.copy()
-                context2['lang'] = partner.lang
-                # set company_id in context, so the correct default journal will be selected
-                context2['force_company'] = curr_invoice['company_id']
-                # set force_company in context so the correct product properties are selected (eg. income account)
-                context2['company_id'] = curr_invoice['company_id']
 
                 last_invoice = invoice_obj.create(cr, uid, curr_invoice, context=context2)
                 invoices.append(last_invoice)
 
=== added directory 'hr_timesheet_invoice/tests'
=== added file 'hr_timesheet_invoice/tests/__init__.py'
--- hr_timesheet_invoice/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ hr_timesheet_invoice/tests/__init__.py	2013-08-01 13:22:31 +0000
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from . import test_multi_company
+
+checks = [
+    test_multi_company,
+]
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'hr_timesheet_invoice/tests/test_multi_company.py'
--- hr_timesheet_invoice/tests/test_multi_company.py	1970-01-01 00:00:00 +0000
+++ hr_timesheet_invoice/tests/test_multi_company.py	2013-08-01 13:22:31 +0000
@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.tests import common
+
+
+class test_multi_company(common.TransactionCase):
+
+    QTY = 5.0
+    PRICE = 75
+
+    def prepare(self):
+        # super(test_multi_company, self).setUp()
+
+        self.company_obj = self.registry('res.company')
+        self.analytic_account_obj = self.registry('account.analytic.account')
+        self.analytic_line_obj = self.registry('account.analytic.line')
+        self.invoice_obj = self.registry('account.invoice')
+        self.product_obj = self.registry('product.product')
+
+        # load main company
+        self.company_a = self.browse_ref('base.main_company')
+        # create an analytic account
+        self.aa_id = self.analytic_account_obj.create(self.cr, self.uid, {
+                'name': 'Project',
+                'company_id': self.company_a.id,
+                'partner_id': self.ref('base.res_partner_2'),
+                'pricelist_id': self.ref('product.list0'),
+            })
+        # set a known price on product
+        self.product_obj.write(self.cr, self.uid, self.ref('product.product_product_consultant'), {
+                'list_price': self.PRICE,
+            })
+
+    def create_invoice(self):
+        # create an analytic line to invoice
+        line_id = self.analytic_line_obj.create(self.cr, self.uid, {
+                'account_id': self.aa_id,
+                'amount': -1.0,
+                'general_account_id': self.ref('account.a_expense'),
+                'journal_id': self.ref('hr_timesheet.analytic_journal'),
+                'name': 'some work',
+                'product_id': self.ref('product.product_product_consultant'),
+                'product_uom_id': self.ref('product.product_uom_hour'),
+                'to_invoice': self.ref('hr_timesheet_invoice.timesheet_invoice_factor2'),  # 50%
+                'unit_amount': self.QTY,
+            })
+        # XXX too strong coupling with UI?
+        wizard_obj = self.registry('hr.timesheet.invoice.create')
+        wizard_id = wizard_obj.create(self.cr, self.uid, {
+                'date': True,
+                'name': True,
+                'price': True,
+                'time': True,
+            }, context={'active_ids': [line_id]})
+        act_win = wizard_obj.do_create(self.cr, self.uid, [wizard_id], context={'active_ids': [line_id]})
+        invoice_ids = self.invoice_obj.search(self.cr, self.uid, act_win['domain'])
+        invoices = self.invoice_obj.browse(self.cr, self.uid, invoice_ids)
+        self.assertEquals(1, len(invoices))
+        return invoices[0]
+
+    def test_00(self):
+        """ invoice task work basic test """
+        self.prepare()
+        invoice = self.create_invoice()
+        self.assertEquals(round(self.QTY * self.PRICE * 0.5, 2), invoice.amount_untaxed)
+
+    def test_01(self):
+        """ invoice task work for analytic account of other company """
+        self.prepare()
+        # create a company B with its own account chart
+        self.company_b_id = self.company_obj.create(self.cr, self.uid, {'name': 'Company B'})
+        self.company_b = self.company_obj.browse(self.cr, self.uid, self.company_b_id)
+        mc_wizard = self.registry('wizard.multi.charts.accounts')
+        mc_wizard_id = mc_wizard.create(self.cr, self.uid, {
+                'company_id': self.company_b_id,
+                'chart_template_id': self.ref('account.conf_chart0'),
+                'code_digits': 2,
+                # 'sale_tax': config.sale_tax.id,
+                # 'purchase_tax': config.purchase_tax.id,
+                'sale_tax_rate': 0.10,
+                'purchase_tax_rate': 0.10,
+                # 'complete_tax_set': config.complete_tax_set,
+                'currency_id': self.company_b.currency_id.id,
+            })
+        mc_wizard.execute(self.cr, self.uid, [mc_wizard_id])
+        # set our analytic account on company B
+        self.analytic_account_obj.write(self.cr, self.uid, [self.aa_id], {
+                'company_id': self.company_b_id,
+            })
+        invoice = self.create_invoice()
+        self.assertEquals(self.company_b_id, invoice.company_id.id, "invoice created for wrong company")
+        self.assertEquals(self.company_b_id, invoice.journal_id.company_id.id, "invoice created with journal of wrong company")
+        self.assertEquals(self.company_b_id, invoice.invoice_line[0].account_id.company_id.id, "invoice line created with account of wrong company")
+        self.assertEquals(self.company_b_id, invoice.account_id.company_id.id, "invoice line created with partner account of wrong company")
+        # self.assertEquals(self.company_b_id, invoice.fiscal_position.company_id.id, "invoice line created with fiscal position of wrong company")
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: