Merge lp:~openerp-community-testers/openobject-addons/trunk-bug1067541 into lp:openobject-addons

[Stéphane Bidoul (Acsone)]

Apparently this branch from the test sprint was not submitted for merging.

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

Hello there,

Since this MP has sadly been left unattended since the test sprint, it slowly became conflicting.

We had to recreate a new one [1], so I'm closing this one.

Would you be so kind as to review it before it conflicts again? It's a bit of a corner case but a very real one in multi-company context and it is accompanied with a test.

[1] https://code.launchpad.net/~lmi/openobject-addons/7.0-bug1067541/+merge/178026.

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

Marking disapproved to close the MP.

review: Disapprove

Unmerged revisions

7902. By Stéphane Bidoul (Acsone) on 2012-10-31

[IMP] hr_timesheet_invoice/tests now use the ref and browse_ref from the common test classes

7901. By Stéphane Bidoul (Acsone) on 2012-10-31

[FIX] bill task work selects wrong receivable account in multi-company context

7900. By Stéphane Bidoul (Acsone) on 2012-10-31

hr_timesheet_invoice: test for lp:1067541

7899. By Stéphane Bidoul (Acsone) on 2012-10-31

hr_timesheet_invoice: first python tests in preparation for multicompany regression tests

7898. By Launchpad Translations on behalf of openerp on 2012-10-31

Launchpad automatic translations update.

7897. By Olivier Dony (Odoo) on 2012-10-30

[FIX] account: currency_id must be passed to the chart installation wizard

Otherwise the installation of a chart of account
via the settings page fails miserably.

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2012-11-26 18:28:11 +0000
+++ account/account_invoice_view.xml	2012-11-28 20:08:30 +0000
@@ -344,7 +344,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)"/>

=== 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	2012-11-28 20:08:30 +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	2012-11-28 20:08:30 +0000
@@ -0,0 +1,115 @@
+# -*- 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:

=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py'
--- hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py	2012-11-28 11:40:02 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py	2012-11-28 20:08:30 +0000
@@ -23,6 +23,168 @@
 from osv import osv, fields
 from tools.translate import _
 
+<<<<<<< TREE
+=======
+## Create an invoice based on selected timesheet lines
+#
+
+class account_analytic_line(osv.osv):
+    _inherit = "account.analytic.line"
+    def _get_invoice_price(self, cr, uid, account, product_id, user_id, qty, context = {}):
+        pro_price_obj = self.pool.get('product.pricelist')
+        if account.pricelist_id:
+            pl = account.pricelist_id.id
+            price = pro_price_obj.price_get(cr,uid,[pl], product_id, qty or 1.0, account.partner_id.id, context=context)[pl]
+        else:
+            price = 0.0
+        return price
+
+
+    #
+    # data = {
+    #   'date': boolean
+    #   'time': boolean
+    #   'name': boolean
+    #   'price': boolean
+    #   'product': many2one id
+    # }
+    def invoice_cost_create(self, cr, uid, ids, data=None, context=None):
+        analytic_account_obj = self.pool.get('account.analytic.account')
+        account_payment_term_obj = self.pool.get('account.payment.term')
+        invoice_obj = self.pool.get('account.invoice')
+        product_obj = self.pool.get('product.product')
+        invoice_factor_obj = self.pool.get('hr_timesheet_invoice.factor')
+        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 = {}
+        if data is None:
+            data = {}
+
+        account_ids = {}
+        for line in self.pool.get('account.analytic.line').browse(cr, uid, ids, context=context):
+            account_ids[line.account_id.id] = True
+
+        account_ids = account_ids.keys() #data['accounts']
+        for account in analytic_account_obj.browse(cr, uid, account_ids, context=context):
+            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
+
+            # browse partner in a context with force_company so we get the correct properties            
+            partner = res_partner_obj.browse(cr, uid, account.partner_id.id, context=context2)
+            
+            if (not partner) or not (account.pricelist_id):
+                raise osv.except_osv(_('Analytic Account incomplete !'),
+                        _('Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:\n%s.') % (account.name,))
+
+            date_due = False
+            if partner.property_payment_term:
+                pterm_list= account_payment_term_obj.compute(cr, uid,
+                        partner.property_payment_term.id, value=1,
+                        date_ref=time.strftime('%Y-%m-%d'))
+                if pterm_list:
+                    pterm_list = [line[0] for line in pterm_list]
+                    pterm_list.sort()
+                    date_due = pterm_list[-1]
+
+            curr_invoice = {
+                'name': time.strftime('%d/%m/%Y')+' - '+account.name,
+                'partner_id': account.partner_id.id,
+                'company_id': account.company_id.id,
+                'payment_term': partner.property_payment_term.id or False,
+                'account_id': partner.property_account_receivable.id,
+                'currency_id': account.pricelist_id.currency_id.id,
+                'date_due': date_due,
+                'fiscal_position': account.partner_id.property_account_position.id
+            }
+
+            last_invoice = invoice_obj.create(cr, uid, curr_invoice, context=context2)
+            invoices.append(last_invoice)
+
+            cr.execute("SELECT product_id, user_id, to_invoice, sum(unit_amount), product_uom_id, name " \
+                    "FROM account_analytic_line as line " \
+                    "WHERE account_id = %s " \
+                        "AND id IN %s AND to_invoice IS NOT NULL " \
+                    "GROUP BY product_id, user_id, to_invoice, product_uom_id, name", (account.id, tuple(ids),))
+
+            for product_id, user_id, factor_id, qty, uom, line_name in cr.fetchall():
+                if data.get('product'):
+                    product_id = data['product'][0]
+                product = product_obj.browse(cr, uid, product_id, context=context2)
+                if not product:
+                    raise osv.except_osv(_('Error!'), _('There is no product defined for the line %s. Please select one or force the product through the wizard.') % (line_name))
+                factor = invoice_factor_obj.browse(cr, uid, factor_id, context=context2)
+                factor_name = product_obj.name_get(cr, uid, [product_id], context=context2)[0][1]
+                if factor.customer_name:
+                    factor_name += ' - ' + factor.customer_name
+
+                ctx =  context.copy()
+                ctx.update({'uom':uom})
+
+                price = self._get_invoice_price(cr, uid, account, product_id, user_id, qty, ctx)
+
+                general_account = product.product_tmpl_id.property_account_income or product.categ_id.property_account_income_categ
+                if not general_account:
+                    raise osv.except_osv(_("Configuration Error!"), _("Please define income account for product '%s'.") % product.name)
+                taxes = product.taxes_id or general_account.tax_ids
+                tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
+                curr_line = {
+                    'price_unit': price,
+                    'quantity': qty,
+                    'discount':factor.factor,
+                    'invoice_line_tax_id': [(6,0,tax )],
+                    'invoice_id': last_invoice,
+                    'name': factor_name,
+                    'product_id': product_id,
+                    'invoice_line_tax_id': [(6,0,tax)],
+                    'uos_id': uom,
+                    'account_id': general_account.id,
+                    'account_analytic_id': account.id,
+                }
+
+                #
+                # Compute for lines
+                #
+                cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %s and id IN %s AND product_id=%s and to_invoice=%s ORDER BY account_analytic_line.date", (account.id, tuple(ids), product_id, factor_id))
+
+                line_ids = cr.dictfetchall()
+                note = []
+                for line in line_ids:
+                    # set invoice_line_note
+                    details = []
+                    if data.get('date', False):
+                        details.append(line['date'])
+                    if data.get('time', False):
+                        if line['product_uom_id']:
+                            details.append("%s %s" % (line['unit_amount'], product_uom_obj.browse(cr, uid, [line['product_uom_id']],context2)[0].name))
+                        else:
+                            details.append("%s" % (line['unit_amount'], ))
+                    if data.get('name', False):
+                        details.append(line['name'])
+                    note.append(u' - '.join(map(lambda x: unicode(x) or '',details)))
+
+                if note:
+                    curr_line['name'] += "\n" + ("\n".join(map(lambda x: unicode(x) or '',note)))
+                invoice_line_obj.create(cr, uid, curr_line, context=context)
+                cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id IN %s", (last_invoice, account.id, tuple(ids)))
+
+            invoice_obj.button_reset_taxes(cr, uid, [last_invoice], context)
+        return invoices
+
+#
+# TODO: check unit of measure !!!
+#
+
+>>>>>>> MERGE-SOURCE
 class hr_timesheet_invoice_create(osv.osv_memory):
 
     _name = 'hr.timesheet.invoice.create'