Merge lp:~julie-w/unifield-server/US-5608 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account/account.py'
--- bin/addons/account/account.py	2019-07-30 09:13:43 +0000
+++ bin/addons/account/account.py	2019-09-24 13:32:21 +0000
@@ -1909,6 +1909,9 @@
         'parent_id':fields.many2one('account.tax', 'Parent Tax Account', select=True),
         'child_ids':fields.one2many('account.tax', 'parent_id', 'Child Tax Accounts'),
         'child_depend':fields.boolean('Tax on Children', help="Set if the tax computation is based on the computation of child taxes rather than on the total amount."),
+        'partner_id': fields.many2one('res.partner', 'Partner',
+                                      domain=[('partner_type', '=', 'external'), ('active', '=', True)],
+                                      ondelete='restrict'),
         'python_compute':fields.text('Python Code'),
         'python_compute_inv':fields.text('Python Code (reverse)'),
         'python_applicable':fields.text('Python Code'),
@@ -1963,11 +1966,31 @@
             ids = self.search(cr, user, args, limit=limit, context=context or {})
         return self.name_get(cr, user, ids, context=context)
 
+    def _check_tax_partner(self, cr, uid, vals, context=None):
+        """
+        Raises an error in case the partner selected for the tax isn't allowed
+        """
+        if context is None:
+            context = {}
+        partner_obj = self.pool.get('res.partner')
+        if vals.get('partner_id'):
+            partner = partner_obj.browse(cr, uid, vals['partner_id'], fields_to_fetch=['active', 'partner_type', 'name'], context=context)
+            if not partner.active or partner.partner_type != 'external':
+                raise osv.except_osv(_('Error'),
+                                     _("You can't link the tax to the Partner %s: only active external partners are allowed.") % partner.name)
+
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        self._check_tax_partner(cr, uid, vals, context=context)
+        return super(account_tax, self).create(cr, uid, vals, context=context)
+
     def write(self, cr, uid, ids, vals, context=None):
         if not ids:
             return True
         if vals.get('type', False) and vals['type'] in ('none', 'code'):
             vals.update({'amount': 0.0})
+        self._check_tax_partner(cr, uid, vals, context=context)
         return super(account_tax, self).write(cr, uid, ids, vals, context=context)
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
@@ -2041,9 +2064,9 @@
         obj_partener_address = self.pool.get('res.partner.address')
         for tax in taxes:
             # we compute the amount for the current tax object and append it to the result
-
+            description = "%s%s%s" % (tax.name, partner and ' - ' or '', partner and partner.name or '')  # tax name and INVOICE partner name
             data = {'id':tax.id,
-                    'name':tax.description and tax.description + " - " + tax.name or tax.name,
+                    'name': description,
                     'account_collected_id':tax.account_collected_id.id,
                     'account_paid_id':tax.account_paid_id.id,
                     'base_code_id': tax.base_code_id.id,
@@ -2200,10 +2223,11 @@
                 todo = 0
             else:
                 todo = 1
+            description = "%s%s%s" % (tax.name, partner and ' - ' or '', partner and partner.name or '')  # tax name and INVOICE partner name
             res.append({
                 'id': tax.id,
                 'todo': todo,
-                'name': tax.name,
+                'name': description,
                 'amount': amount,
                 'account_collected_id': tax.account_collected_id.id,
                 'account_paid_id': tax.account_paid_id.id,
@@ -2245,7 +2269,7 @@
             tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
             one tax for each tax id in IDS and their children
         """
-        res = self._unit_compute_inv(cr, uid, taxes, price_unit, address_id, product, partner=None)
+        res = self._unit_compute_inv(cr, uid, taxes, price_unit, address_id, product, partner=partner)
         total = 0.0
         obj_precision = self.pool.get('decimal.precision')
         for r in res:

=== modified file 'bin/addons/account/account_invoice_view.xml'
--- bin/addons/account/account_invoice_view.xml	2019-07-29 15:00:38 +0000
+++ bin/addons/account/account_invoice_view.xml	2019-09-24 13:32:21 +0000
@@ -216,13 +216,15 @@
                                 <field name="tax_line" nolabel="1" attrs="{'invisible': [('vat_ok', '=', False)], 'readonly': ['|', ('state','!=', 'draft'), '&amp;', ('type', '=', 'in_invoice'), ('synced', '=', True)]}">
                                     <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,context)"/>
+                                        <field name="account_tax_id" on_change="tax_code_change(account_tax_id, parent.amount_untaxed, parent.partner_id, context)"/>
                                         <field name="name"/>
 
                                         <field name="account_id" groups="account.group_account_invoice"
                                                domain="[('type', 'not in', ['view', 'consolidation']),
                                                         ('user_type_code', '=', 'tax')]"/>
 
+                                        <field name="partner_id" readonly="1"/>
+
                                         <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
                                         <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
 

=== modified file 'bin/addons/account/account_view.xml'
--- bin/addons/account/account_view.xml	2019-01-31 14:39:54 +0000
+++ bin/addons/account/account_view.xml	2019-09-24 13:32:21 +0000
@@ -972,6 +972,7 @@
                         <field name="type_tax_use"/>
                         <field name="price_include"/>
                         <field name="active"/>
+                        <field name="partner_id"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <notebook colspan="4">

=== modified file 'bin/addons/account/invoice.py'
--- bin/addons/account/invoice.py	2019-07-25 14:58:06 +0000
+++ bin/addons/account/invoice.py	2019-09-24 13:32:21 +0000
@@ -1111,7 +1111,7 @@
     def line_get_convert(self, cr, uid, x, part, date, context=None):
         return {
             'date_maturity': x.get('date_maturity', False),
-            'partner_id': part,
+            'partner_id': x.get('partner_id') or part,
             'name': x['name'][:64],
             'date': date,
             'debit_currency': x['price']>0 and x['price'],
@@ -1856,13 +1856,35 @@
             raise osv.except_osv(_('Warning !'), _('The Untaxed Amount is zero. Please press the Save & Edit button before saving the %s tax.') % (vals['name']))
         return True
 
+    def _update_tax_partner(self, cr, uid, vals, context=None):
+        """
+        Updates vals with the partner of the related tax
+
+        Note that in case a partner_id is already in vals, it is used (e.g. in case of a SI refund the SR tax lines must be exactly
+        the same as the SI ones, even if the partner linked to the related account.tax has changed in the meantime)
+        """
+        if context is None:
+            context = {}
+        tax_obj = self.pool.get('account.tax')
+        if 'partner_id' not in vals and 'account_tax_id' in vals:
+            tax_partner_id = False
+            if vals['account_tax_id']:  # note that at doc level it's possible not to have any link to a tax from the system
+                tax = tax_obj.browse(cr, uid, vals['account_tax_id'], fields_to_fetch=['partner_id'], context=context)
+                tax_partner_id = tax.partner_id and tax.partner_id.id or False
+            vals.update({'partner_id': tax_partner_id})
 
     def create(self, cr, uid, vals, context=None):
-        if context == None:
+        if context is None:
             context = {}
         self._check_untaxed_amount(cr, uid, vals, context)
+        self._update_tax_partner(cr, uid, vals, context=context)
         return super(account_invoice_tax, self).create(cr, uid, vals, context=context)
 
+    def write(self, cr, uid, ids, vals, context=None):
+        if context is None:
+            context = {}
+        self._update_tax_partner(cr, uid, vals, context=context)
+        return super(account_invoice_tax, self).write(cr, uid, ids, vals, context=context)
 
     def _count_factor(self, cr, uid, ids, name, args, context=None):
         res = {}
@@ -1896,16 +1918,31 @@
         'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
         'factor_base': fields.function(_count_factor, method=True, string='Multipication factor for Base code', type='float', multi="all"),
         'factor_tax': fields.function(_count_factor, method=True, string='Multipication factor Tax code', type='float', multi="all"),
-        'account_tax_id': fields.many2one('account.tax', 'Tax', domain=[('price_include', '=', False)])
+        'account_tax_id': fields.many2one('account.tax', 'Tax', domain=[('price_include', '=', False)]),
+        'partner_id': fields.many2one('res.partner', 'Partner', ondelete='restrict'),
     }
 
-
-    def tax_code_change(self, cr, uid, ids, account_tax_id, amount_untaxed, context=None):
+    def tax_code_change(self, cr, uid, ids, account_tax_id, amount_untaxed, inv_partner_id, context=None):
+        if context is None:
+            context = {}
         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)}}
+            partner_obj = self.pool.get('res.partner')
+            inv_partner = inv_partner_id and partner_obj.browse(cr, uid, inv_partner_id,
+                                                                fields_to_fetch=['name', 'lang'], context=context) or None
+            inv_partner_name = inv_partner and inv_partner.name or ''
+            # use the language of the partner for the tax name (to be consistent with what's done when clicking on Compute Taxes)
+            inv_partner_lang = inv_partner and inv_partner.lang or ''
+            new_context = context.copy()
+            if inv_partner_lang:
+                new_context.update({'lang': inv_partner_lang})
+            tax = atx_obj.browse(cr, uid, account_tax_id, fields_to_fetch=['name', 'account_collected_id'], context=new_context)
+            description = "%s%s%s" % (tax.name, inv_partner_name and ' - ' or '', inv_partner_name or '')
+            ret = {'value': {'account_id': tax.account_collected_id and tax.account_collected_id.id or False,
+                             'name': description,
+                             'base_amount': amount_untaxed,
+                             'amount': self._calculate_tax(cr, uid, account_tax_id, amount_untaxed)}}
         return ret
 
     def _calculate_tax(self, cr, uid, account_tax_id, amount_untaxed):
@@ -2023,7 +2060,8 @@
                 'price': t['amount'] or 0.0,
                 'account_id': t['account_id'],
                 'tax_code_id': t['tax_code_id'],
-                'tax_amount': t['tax_amount']
+                'tax_amount': t['tax_amount'],
+                'partner_id': t['partner_id'],
             })
         return res
 

=== modified file 'bin/addons/account/wizard/account_invoice_refund.py'
--- bin/addons/account/wizard/account_invoice_refund.py	2019-07-25 15:47:28 +0000
+++ bin/addons/account/wizard/account_invoice_refund.py	2019-09-24 13:32:21 +0000
@@ -116,11 +116,12 @@
     def _get_reconcilable_amls(self, aml_list, to_reconcile_dict):
         """
         Fill in to_reconcile_dict with the aml from aml_list having a reconcilable account
-        (key = account id, value = list of aml ids)
+        key = tuple with (account id, partner_id, is_counterpart)
+        value = list of aml ids
         """
         for ml in aml_list:
             if ml.account_id.reconcile:
-                key = (ml.account_id.id, ml.is_counterpart)
+                key = (ml.account_id.id, ml.partner_id and ml.partner_id.id or False, ml.is_counterpart)
                 to_reconcile_dict.setdefault(key, []).append(ml.id)
 
     def compute_refund(self, cr, uid, ids, mode='refund', context=None):
@@ -234,8 +235,8 @@
                     self._get_reconcilable_amls(movelines, to_reconcile)
                     self._get_reconcilable_amls(refund.move_id.line_id, to_reconcile)
                     # reconcile the lines grouped by account
-                    for account_id, is_counterpart in to_reconcile:
-                        account_m_line_obj.reconcile(cr, uid, to_reconcile[(account_id, is_counterpart)],
+                    for account_id, partner_id, is_counterpart in to_reconcile:
+                        account_m_line_obj.reconcile(cr, uid, to_reconcile[(account_id, partner_id, is_counterpart)],
                                                      writeoff_period_id=period,
                                                      writeoff_journal_id = inv.journal_id.id,
                                                      writeoff_acc_id=account_id

=== modified file 'bin/addons/msf_partner/partner.py'
--- bin/addons/msf_partner/partner.py	2019-02-08 16:27:30 +0000
+++ bin/addons/msf_partner/partner.py	2019-09-24 13:32:21 +0000
@@ -666,6 +666,26 @@
 
         return True
 
+    def _check_existing_tax_partner(self, cr, uid, ids, context=None):
+        """
+        Raises an error in case the partner has been used in a tax (to be used when trying to de-activate partners)
+        """
+        if context is None:
+            context = {}
+        tax_obj = self.pool.get('account.tax')
+        inv_obj = self.pool.get('account.invoice')
+        inv_tax_obj = self.pool.get('account.invoice.tax')
+        if tax_obj.search_exist(cr, uid, [('partner_id', 'in', ids)], context=context):
+            raise osv.except_osv(_('Warning'),
+                                 _("Impossible to deactivate a partner used for a tax."))
+        # use case: partner linked to a tax, related tax lines generated and partner removed from the tax
+        # Note that only draft account.invoices need to be checked as other ones have generated JIs (so are already checked)
+        draft_invoice_ids = inv_obj.search(cr, uid, [('state', '=', 'draft')], order='NO_ORDER', context=context)
+        if draft_invoice_ids:
+            if inv_tax_obj.search_exist(cr, uid, [('partner_id', 'in', ids), ('invoice_id', 'in', draft_invoice_ids)], context=context):
+                raise osv.except_osv(_('Warning'),
+                                     _("Impossible to deactivate a partner used in the tax line of an invoice."))
+
     def write(self, cr, uid, ids, vals, context=None):
         if not ids:
             return True
@@ -701,6 +721,7 @@
                     raise osv.except_osv(_('Warning'),
                                          _("""The following documents linked to the partner need to be closed before deactivating the partner: %s"""
                                            ) % (objects_linked_to_partner))
+                self._check_existing_tax_partner(cr, uid, ids, context=context)
 
         if vals.get('name'):
             vals['name'] = vals['name'].replace('\r\n', ' ').replace('\r', ' ').replace('\n', ' ').strip()

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-09-17 16:00:23 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-09-24 13:32:21 +0000
@@ -49841,6 +49841,8 @@
 #: report:addons/stock/report/stock_delivery_report_xls.mako:186
 #: report:addons/stock/report/stock_delivery_report_xls.mako:211
 #: field:stock.delivery.wizard,partner_id:0
+#: field:account.invoice.tax,partner_id:0
+#: field:account.tax,partner_id:0
 #, python-format
 msgid "Partner"
 msgstr "Partenaire"
@@ -107372,3 +107374,21 @@
 #: report:purchase.order.merged:0
 msgid "Functional total cost :"
 msgstr "Total Coût Fonctionnel :"
+
+#. module: msf_partner
+#: code:addons/msf_partner/partner.py:680
+#, python-format
+msgid "Impossible to deactivate a partner used for a tax."
+msgstr "Impossible de désactiver un partenaire utilisé pour une taxe."
+
+#. module: msf_partner
+#: code:addons/msf_partner/partner.py:687
+#, python-format
+msgid "Impossible to deactivate a partner used in the tax line of an invoice."
+msgstr "Impossible de désactiver un partenaire utilisé dans la ligne de taxe d'une facture."
+
+#. module: account
+#: code:addons/account/account.py:1980
+#, python-format
+msgid "You can't link the tax to the Partner %s: only active external partners are allowed."
+msgstr "Vous ne pouvez pas lier la taxe au partenaire %s : seuls les partenaires externes actifs sont autorisés."

=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2019-08-08 13:55:43 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2019-09-24 13:32:21 +0000
@@ -126,7 +126,7 @@
 msf_sync_data_server.standard_product_list_line,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('list_id' , 'in', ('product.list', 'id', [('standard_list_ok','=','True')]))]","['comment','list_id/id','ref','name/id']",OC,product.list.line,,Standard Product List Line,Valid,,606
 msf_sync_data_server.tax_code,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,[],"['code', 'info', 'name', 'notprintable', 'sign']",OC,account.tax.code,,Tax Code,Valid,,610
 msf_sync_data_server.tax_code_tree,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('parent_id','!=','')]",['parent_id/id'],OC,account.tax.code,,Tax Code Tree,Valid,,611
-msf_sync_data_server.account_tax,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,[],"['account_collected_id/id', 'account_paid_id/id', 'active', 'amount', 'applicable_type', 'base_code_id/id', 'base_sign', 'child_depend', 'description', 'domain', 'include_base_amount', 'name', 'price_include', 'python_applicable', 'python_compute', 'python_compute_inv', 'ref_base_code_id/id', 'ref_base_sign', 'ref_tax_code_id/id', 'ref_tax_sign', 'sequence', 'tax_code_id/id', 'tax_sign', 'type', 'type_tax_use']",OC,account.tax,,Account Tax,Valid,,612
+msf_sync_data_server.account_tax,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,[],"['account_collected_id/id', 'account_paid_id/id', 'active', 'amount', 'applicable_type', 'base_code_id/id', 'base_sign', 'child_depend', 'description', 'domain', 'include_base_amount', 'name', 'price_include', 'python_applicable', 'python_compute', 'python_compute_inv', 'ref_base_code_id/id', 'ref_base_sign', 'ref_tax_code_id/id', 'ref_tax_sign', 'sequence', 'tax_code_id/id', 'tax_sign', 'type', 'type_tax_use', 'partner_id/id']",OC,account.tax,,Account Tax,Valid,,612
 msf_sync_data_server.account_tax_tree,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('parent_id','!=','')]",['parent_id/id'],OC,account.tax,,Account Tax Tree,Valid,,613
 msf_sync_data_server.composition_kit,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('state','=','completed'),('composition_type','=','theoretical')]","['active', 'composition_creation_date', 'composition_description', 'composition_product_id/id', 'composition_type', 'composition_version', 'composition_version_txt', 'name', 'state']",OC,composition.kit,,Theoretical Kit Composition List,Valid,,620
 msf_sync_data_server.composition_item,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('item_kit_id' , 'in' , ('composition.kit' , 'id' , [('state','=','completed'),('composition_type','=','theoretical')]))]","['item_asset_id/id', 'item_kit_id/id', 'item_module', 'item_product_id/id', 'item_qty', 'item_uom_id/id']",OC,composition.item,,Theoretical Kit Composition List Line,Valid,,621

=== modified file 'bin/addons/sync_client/update.py'
--- bin/addons/sync_client/update.py	2019-04-03 09:52:48 +0000
+++ bin/addons/sync_client/update.py	2019-09-24 13:32:21 +0000
@@ -964,6 +964,8 @@
 
                         if update.model == 'res.partner.address' and field == 'partner_id/id':
                             return {'res': False, 'error_message': 'partner_id %s not found' % xmlid}
+                        if update.model == 'account.tax' and field == 'partner_id/id':
+                            return {'res': False, 'error_message': 'partner_id %s not found' % xmlid}
                         if update.model == 'account.analytic.line' and field in ('cost_center_id/id', 'destination_id/id'):
                             return {'res': False, 'error_message': 'Analytic Account %s not found' % xmlid}
                         fb = fallback.get(field, False)