Merge lp:~julie-w/unifield-addons/UTP-28 into lp:unifield-addons

[jftempo]

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2015-05-13 12:33:38 +0000
+++ account/account_invoice_view.xml	2016-02-26 09:46:51 +0000
@@ -190,7 +190,7 @@
                                 <field name="tax_line" nolabel="1">
                                     <tree editable="bottom" string="Taxes">
                                         <field name="invoice_id" invisible="True"/>
-                                        <field name="account_tax_id" on_change="tax_code_change(account_tax_id,parent.amount_untaxed,parent.amount_total)"/>
+                                        <field name="account_tax_id" on_change="tax_code_change(account_tax_id,parent.amount_untaxed,parent.amount_total,context)"/>
                                         <field name="name"/>
 
                                         <field name="account_id" groups="account.group_account_invoice" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation'),('user_type.code','not in',['income','expense'])]"/>

=== modified file 'account/invoice.py'
--- account/invoice.py	2015-07-24 11:50:33 +0000
+++ account/invoice.py	2016-02-26 09:46:51 +0000
@@ -749,10 +749,11 @@
             for tax in inv.tax_line:
                 if tax.manual:
                     continue
-                key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.id)
+                key = tax.account_tax_id.id  # taxes are grouped by id
                 tax_key.append(key)
                 if not key in compute_taxes:
-                    raise osv.except_osv(_('Warning !'), _('Global taxes defined, but are not in invoice lines !'))
+                    raise osv.except_osv(_('Warning !'),
+                                         _('Global taxes defined, click on compute to update tax base !'))
                 base = compute_taxes[key]['base']
                 if abs(base - tax.base) > inv.company_id.currency_id.rounding:
                     raise osv.except_osv(_('Warning !'), _('Tax base different !\nClick on compute to update tax base'))
@@ -1691,11 +1692,13 @@
 
 
     def tax_code_change(self, cr, uid, ids, account_tax_id, amount_untaxed,
-        amount_total):
-        atx_obj = self.pool.get('account.tax')
-        atx = atx_obj.browse(cr, uid, account_tax_id)
-        return {'value': {'account_id': atx.account_collected_id.id, 'name': "{0} - {1}".format(atx.name,atx.description), 'base_amount': amount_untaxed, 'amount': self._calculate_tax(cr, uid, account_tax_id, amount_untaxed, amount_total)}}
-
+        amount_total, context=None):
+        ret = {}
+        if account_tax_id:
+            atx_obj = self.pool.get('account.tax')
+            atx = atx_obj.browse(cr, uid, account_tax_id, context=context)
+            ret = {'value': {'account_id': atx.account_collected_id.id, 'name': "{0} - {1}".format(atx.name, atx.description or ''), 'base_amount': amount_untaxed, 'amount': self._calculate_tax(cr, uid, account_tax_id, amount_untaxed, amount_total)}}
+        return ret
 
     def _calculate_tax(self, cr, uid, account_tax_id, amount_untaxed,
         amount_total):
@@ -1766,6 +1769,7 @@
                 val['manual'] = False
                 val['sequence'] = tax['sequence']
                 val['base'] = tax['price_unit'] * line['quantity']
+                val['account_tax_id'] = tax['id']
 
                 if inv.type in ('out_invoice','in_invoice'):
                     val['base_code_id'] = tax['base_code_id']
@@ -1780,7 +1784,7 @@
                     val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
                     val['account_id'] = tax['account_paid_id'] or line.account_id.id
 
-                key = (val['tax_code_id'], val['base_code_id'], val['account_id'])
+                key = tax['id']  # taxes are grouped by id
                 if not key in tax_grouped:
                     tax_grouped[key] = val
                 else: