Merge lp:~jfb-tempo-consulting/unifield-server/US-6475 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account/invoice.py'
--- bin/addons/account/invoice.py	2022-01-06 14:20:38 +0000
+++ bin/addons/account/invoice.py	2022-03-17 16:06:51 +0000
@@ -1925,7 +1925,7 @@
 
 
     def _check_untaxed_amount(self, cr, uid, vals, context=None):
-        if 'account_tax_id' in vals and vals['account_tax_id'] and vals['base_amount'] == 0:
+        if 'account_tax_id' in vals and vals['account_tax_id'] and 'base_amount' in vals and vals['base_amount'] == 0:
             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
 
@@ -1978,6 +1978,7 @@
 
     _columns = {
         'invoice_id': fields.many2one('account.invoice', 'Invoice Line', ondelete='cascade', select=True),
+        'purchase_id': fields.many2one('purchase.order', 'PO', ondelete='cascade', select=True),
         'name': fields.char('Tax Description', size=64, required=True),
         'account_id': fields.many2one('account.account', 'Tax Account', required=True, domain=[('type','<>','view'),('type','<>','income'), ('type', '<>', 'closed')]),
         'base': fields.float('Base', digits_compute=dp.get_precision('Account')),

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2022-02-16 11:35:18 +0000
+++ bin/addons/msf_profile/data/patches.xml	2022-03-17 16:06:51 +0000
@@ -753,5 +753,9 @@
         <record id="us_9570_ocb_auto_sync_time" model="patch.scripts">
             <field name="method">us_9570_ocb_auto_sync_time</field>
         </record>
+
+        <record id="us_6475_set_has_tax_on_po" model="patch.scripts">
+            <field name="method">us_6475_set_has_tax_on_po</field>
+        </record>
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2022-03-02 17:30:56 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2022-03-17 16:06:51 +0000
@@ -114281,3 +114281,15 @@
 #: field:sync.version.instance.monitor,platform:0
 msgid "Platform"
 msgstr "Plate-forme"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Remove taxes on all PO lines ?"
+msgstr "Supprimer les taxes sur toutes les lignes ?"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Remove taxes on lines"
+msgstr "Supprimer les taxes des lignes"
+
+

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2022-02-18 10:27:42 +0000
+++ bin/addons/msf_profile/msf_profile.py	2022-03-17 16:06:51 +0000
@@ -56,6 +56,26 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+    def us_6475_set_has_tax_on_po(self, cr, uid, *a, **b):
+        cr.execute('''
+            update purchase_order
+                set has_tax_at_line_level='t'
+            where
+                id in (
+                select po.id
+                    from
+                purchase_order_line pol, purchase_order po, purchase_order_taxe tax
+                where
+                    po.state in ('draft', 'draft_p', 'validated', 'validated_p') and
+                    pol.order_id = po.id and
+                    pol.state not in ('cancel', 'cancel_r') and
+                    tax.ord_id = pol.id
+            )
+        ''')
+        self.log_info(cr, uid, 'US-6475: set PO has tax on %d records' % cr.rowcount)
+        return True
+
+
     # UF24.0
     def us_9570_ocb_auto_sync_time(self, cr, uid, *a, **b):
         entity_obj = self.pool.get('sync.client.entity')

=== modified file 'bin/addons/purchase/purchase_order.py'
--- bin/addons/purchase/purchase_order.py	2022-02-08 11:03:36 +0000
+++ bin/addons/purchase/purchase_order.py	2022-03-17 16:06:51 +0000
@@ -77,23 +77,50 @@
     def _amount_all(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         cur_obj = self.pool.get('res.currency')
-        for order in self.browse(cr, uid, ids, context=context):
+        pol_obj = self.pool.get('purchase.order.line')
+        tax_obj = self.pool.get('account.tax')
+        for order in self.browse(cr, uid, ids, fields_to_fetch=['pricelist_id', 'partner_address_id', 'partner_id', 'tender_id'], context=context):
             res[order.id] = {
                 'amount_untaxed': 0.0,
                 'amount_tax': 0.0,
                 'amount_total': 0.0,
                 'amount_total_tender_currency': 0.0,
+                'has_tax_at_line_level': False,
             }
-            val = val1 = 0.0
+            amount_tax = 0
+            amount_untaxed = 0
             cur = order.pricelist_id.currency_id
-            for line in order.order_line:
-                if line.state not in ('cancel', 'cancel_r'):
-                    val1 += line.price_subtotal
-                    for c in self.pool.get('account.tax').compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id.id, order.partner_id)['taxes']:
-                        val += c.get('amount', 0.0)
-            res[order.id]['amount_tax'] = cur_obj.round(cr, uid, cur.rounding, val)
-            res[order.id]['amount_untaxed'] = cur_obj.round(cr, uid, cur.rounding, val1)
+
+            cr.execute("""select exists(
+                select pol.id from purchase_order_line pol, purchase_order_taxe t
+                where
+                    t.ord_id = pol.id and pol.state not in ('cancel', 'cancel_r') and pol.order_id = %s)""", (order.id, ))
+            res[order.id]['has_tax_at_line_level'] = cr.fetchone()[0]
+
+            if not res[order.id]['has_tax_at_line_level']:
+                cr.execute("select sum(price_unit * product_qty) from purchase_order_line where order_id = %s and state not in ('cancel', 'cancel_r')", (order.id, ))
+                amount_untaxed = cr.fetchone()[0] or 0
+
+                cr.execute("select sum(amount) from account_invoice_tax where purchase_id = %s", (order.id, ))
+                amount_tax = cr.fetchone()[0] or 0
+
+            else:
+                cr.execute("select pol.id from purchase_order_line pol where pol.state not in ('cancel', 'cancel_r') and pol.order_id = %s", (order.id, ))
+                pol_ids = [x[0] for x in cr.fetchall()]
+                max_size = 400
+                offset = 0
+                while offset < len(pol_ids):
+                    for line in pol_obj.browse(cr, uid, pol_ids[offset:max_size+offset], fields_to_fetch=['taxes_id', 'price_unit', 'product_qty', 'product_id'], context=context):
+                        tax_data = tax_obj.compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id.id, order.partner_id)
+                        amount_untaxed += tax_data.get('total', 0)
+                        for c in tax_data['taxes']:
+                            amount_tax += c.get('amount', 0.0)
+                        offset += max_size
+
+            res[order.id]['amount_tax'] = cur_obj.round(cr, uid, cur.rounding, amount_tax)
+            res[order.id]['amount_untaxed'] = cur_obj.round(cr, uid, cur.rounding, amount_untaxed)
             res[order.id]['amount_total'] = res[order.id]['amount_untaxed'] + res[order.id]['amount_tax']
+
             if order.tender_id and order.tender_id.currency_id \
                     and order.tender_id.currency_id.id != order.pricelist_id.currency_id.id:
                 res[order.id]['amount_total_tender_currency'] = round(cur_obj.compute(cr, uid, cur.id, order.tender_id.currency_id.id,
@@ -207,6 +234,12 @@
 
         return res
 
+    def _get_order_from_corner_tax(self, cr, uid, ids, context=None):
+        if ids:
+            cr.execute('select purchase_id from account_invoice_tax where id in %s', (tuple(ids),))
+            return [x[0] for x in cr.fetchall()]
+        return []
+
     def _get_order(self, cr, uid, ids, context=None):
         result = {}
         for line in self.pool.get('purchase.order.line').browse(cr, uid, ids, fields_to_fetch=['order_id'], context=context):
@@ -852,6 +885,12 @@
                                                     'purchase.order.line': (_get_order, ['date_planned'], 10),
                                                 }
                                                 ),
+        'has_tax_at_line_level': fields.function(_amount_all, method=True, type='boolean', string='Tax at line', store= {
+            'purchase.order.line': [
+                (_get_order, ['taxes_id'], 10),
+                (_get_order_state_changed, ['state'], 10),
+            ]
+        }, multi="sums"),
         'amount_untaxed': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Purchase Price'), string='Untaxed Amount',
                                           store={
                                               'purchase.order.line': [
@@ -864,14 +903,21 @@
                                           'purchase.order.line': [
                                               (_get_order, ['price_subtotal', 'taxes_id', 'price_unit', 'product_qty', 'product_id'], 10),
                                               (_get_order_state_changed, ['state'], 10),
-                                          ]
+                                              (_get_order_from_corner_tax, ['purchase_id', 'amount'], 10),
+                                          ],
+            'account.invoice.tax': [
+                                              (_get_order_from_corner_tax, ['purchase_id', 'amount'], 10),
+                                          ],
         }, multi="sums", help="The tax amount"),
         'amount_total': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Purchase Price'), string='Total',
                                         store={
                                             'purchase.order.line': [
                                                 (_get_order, ['price_subtotal', 'taxes_id', 'price_unit', 'product_qty', 'product_id'], 10),
                                                 (_get_order_state_changed, ['state'], 10),
-                                            ]
+                                            ],
+                                            'account.invoice.tax': [
+                                                (_get_order_from_corner_tax, ['purchase_id', 'amount'], 10),
+                                            ],
         }, multi="sums", help="The total amount"),
         'amount_total_tender_currency': fields.function(_amount_all, method=True, string='Total (Comparison Currency)',
                                                         digits_compute= dp.get_precision('Purchase Price'), store=False,
@@ -927,6 +973,7 @@
         'not_beyond_validated': fields.function(_get_not_beyond_validated, type='boolean', string="Check if lines' and document's state is not beyond validated", method=1),
         'po_version': fields.integer('Migration: manage old flows', help='v1: dpo reception not synced up, SI/CV generated at PO confirmation', internal=1),
         'nb_creation_message_nr': fields.function(_get_nb_creation_message_nr, type='integer', method=1, string='Number of NR creation messages'),
+        'tax_line': fields.one2many('account.invoice.tax', 'purchase_id', 'Tax Lines'),
     }
     _defaults = {
         'po_version': 2,
@@ -1107,7 +1154,8 @@
             if vals.get('pricelist_id') and partner.partner_type == 'external':
                 to_curr_id = self.pool.get('product.pricelist').browse(cr, uid, vals['pricelist_id'], fields_to_fetch=['currency_id'], context=context).currency_id.id
 
-            for order in self.browse(cr, uid, ids, fields_to_fetch=['state', 'date_order', 'partner_id', 'order_line', 'pricelist_id'], context=context):
+            for order in self.browse(cr, uid, ids, fields_to_fetch=['state', 'date_order', 'partner_id', 'order_line', 'pricelist_id', 'tax_line'], context=context):
+                line_changed= False
                 if order.state in ('draft', 'draft_p', 'validated') and vals['partner_id'] != order.partner_id.id:
                     for line in order.order_line:
                         if line.state in ('draft', 'validated_n', 'validated'):
@@ -1133,8 +1181,15 @@
                                 from_curr_id = order.pricelist_id.currency_id.id
                                 price_to_convert = line.price_unit
 
+                            line_changed = True
                             new_price = cur_obj.compute(cr, uid, from_curr_id, to_curr_id, price_to_convert, round=False)
                             pol_obj.write(cr, uid, line.id, {'price_unit': new_price}, context=context)
+                    if line_changed:
+                        tax_line_obj = self.pool.get('account.invoice.tax')
+                        for tax_line in order.tax_line:
+                            new_price = cur_obj.compute(cr, uid, order.pricelist_id.currency_id.id, to_curr_id, tax_line.amount, round=False)
+                            tax_line_obj.write(cr, uid, tax_line.id, {'amount': new_price}, context=context)
+
 
         return super(purchase_order, self).write_web(cr, uid, ids, vals, context=context)
 
@@ -1164,7 +1219,14 @@
         if vals.get('partner_id', False):
             partner = self.pool.get('res.partner').browse(cr, uid, vals.get('partner_id'), context=context)
             # partner type - always set
-            vals.update({'partner_type': partner.partner_type, })
+            vals.update({'partner_type': partner.partner_type})
+            if partner.partner_type != 'external':
+                vals['tax_line'] = False
+                tax_obj = self.pool.get('account.invoice.tax')
+                tax_lines_ids = tax_obj.search(cr, uid, [('purchase_id', 'in', ids)], context=context)
+                if tax_lines_ids:
+                    tax_obj.unlink(cr, uid, tax_lines_ids, context=context)
+
             # internal type (zone) - always set
             vals.update({'internal_type': partner.zone, })
             # erase delivery_confirmed_date if partner_type is internal or section and the date is not filled by synchro - considered updated by synchro by default
@@ -2750,6 +2812,13 @@
 
         return True
 
+    def remove_line_tax(self, cr, uid, ids, context=None):
+        pol_obj = self.pool.get('purchase.order.line')
+        pol_ids = pol_obj.search(cr, uid, [('order_id', 'in', ids), ('state', 'not in', ['confirmed', 'cancel', 'cancel_r', 'done']), ('taxes_id', '!=', False)], context=context)
+        if pol_ids:
+            pol_obj.write(cr, uid, pol_ids, {'taxes_id': [(6, 0, [])]}, context=context)
+        return True
+
     # CTRL
     def update_supplier_info(self, cr, uid, ids, context=None, *args, **kwargs):
         '''

=== modified file 'bin/addons/purchase/purchase_order_line.py'
--- bin/addons/purchase/purchase_order_line.py	2021-12-21 09:46:40 +0000
+++ bin/addons/purchase/purchase_order_line.py	2022-03-17 16:06:51 +0000
@@ -28,7 +28,13 @@
         '''
         Return True if the system configuration VAT management is set to True
         '''
+
+        if context is None:
+            context = {}
         vat_ok = self.pool.get('unifield.setup.configuration').get_config(cr, uid).vat_ok
+        if vat_ok and 'purchase_id' in context:
+            vat_ok = not self.pool.get('account.invoice.tax').search_exists(cr, uid, [('purchase_id', '=', context['purchase_id'])], context=context)
+
         res = {}
         for id in ids:
             res[id] = vat_ok
@@ -2117,6 +2123,18 @@
             if pol.order_id.id not in inv_ids:
                 inv_ids[pol.order_id.id] = pol.order_id.action_invoice_get_or_create(context=context)
 
+            all_taxes = {}
+            if pol.order_id.tax_line and pol.order_id.amount_untaxed:
+                percent = (pol.product_qty * pol.price_unit) / pol.order_id.amount_untaxed
+                all_taxes.setdefault(inv_ids[pol.order_id.id], {})
+                for tax_line in pol.order_id.tax_line:
+                    key = (tax_line.account_tax_id and tax_line.account_tax_id.id or False, tax_line.account_id.id, tax_line.partner_id and tax_line.partner_id.id or False)
+                    if key not in all_taxes[inv_ids[pol.order_id.id]]:
+                        all_taxes[inv_ids[pol.order_id.id]][key] = {
+                            'tax_line': tax_line,
+                            'amount': 0,
+                        }
+                    all_taxes[inv_ids[pol.order_id.id]][key]['amount'] +=  tax_line.amount * percent
 
             if pol.product_id:
                 account_id = pol.product_id.product_tmpl_id.property_account_expense.id
@@ -2150,6 +2168,21 @@
             }, context=context)
 
         self.write(cr, uid, ids, {'invoiced': True}, context=context)
+
+        for inv_id in all_taxes:
+            for key in all_taxes[inv_id]:
+                tax_id = self.pool.get('account.invoice.tax').search(cr, uid, [('invoice_id', '=', inv_id), ('account_tax_id', '=', key[0]), ('account_id', '=', key[1]), ('partner_id', '=', key[2])], context=context)
+                if not tax_id:
+                    self.pool.get('account.invoice.tax').create(cr, uid, {
+                        'invoice_id': inv_id,
+                        'account_tax_id':  key[0],
+                        'account_id': key[1],
+                        'partner_id': key[2],
+                        'name': all_taxes[inv_id][key]['tax_line'].name,
+                        'amount': all_taxes[inv_id][key]['amount']}, context=context)
+                else:
+                    cr.execute('update account_invoice_tax set amount=amount+%s where id = %s', (all_taxes[inv_id][key]['amount'], tax_id[0]))
+
         self.pool.get('account.invoice').button_compute(cr, uid, inv_ids.values(), {'type':'in_invoice'}, set_total=True)
 
 

=== modified file 'bin/addons/purchase/purchase_view.xml'
--- bin/addons/purchase/purchase_view.xml	2022-02-07 14:54:33 +0000
+++ bin/addons/purchase/purchase_view.xml	2022-03-17 16:06:51 +0000
@@ -386,6 +386,23 @@
                                     <field name="currency_id"/>
                                 </tree>
                             </field>
+                                <field name="has_tax_at_line_level" invisible="1" />
+                                <field name="tax_line" nolabel="1" attrs="{'invisible': [('partner_type', '!=', 'external')], 'readonly': ['|', ('not_beyond_validated','=', False), ('has_tax_at_line_level', '=', True)]}">
+                                    <tree editable="bottom" string="Taxes">
+                                        <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"
+                                               domain="[('type', 'not in', ['view', 'consolidation']),
+                                                        ('user_type_code', '=', 'tax')]"/>
+
+                                        <field name="partner_id" readonly="1"/>
+                                        <field name="base" readonly="1"/>
+                                        <field name="amount" />
+                                        <field name="base_amount" invisible="1"/>
+                                    </tree>
+                                </field>
+
                         </page>
                         <page string="Notes">
                             <group colspan="4" col="6">
@@ -430,6 +447,7 @@
                         <field name="functional_amount_untaxed"/>
                         <field name="functional_amount_tax"/>
                         <field name="functional_amount_total"/>
+                        <button type="object" string="Remove taxes on lines" name="remove_line_tax" attrs="{'invisible': ['|', ('has_tax_at_line_level', '=', False), ('not_beyond_validated', '=', False)]}" icon="gtk-cut" confirm="Remove taxes on all PO lines ?"/>
                         <newline/>
                         <field name="total_price_include_transport" readonly="1" attrs="{'invisible': ['|', ('categ', '=', 'transport'), ('display_intl_transport_ok', '=', False)]}"/>
                         <newline/>

=== modified file 'bin/addons/purchase/purchase_workflow.py'
--- bin/addons/purchase/purchase_workflow.py	2021-10-04 14:56:23 +0000
+++ bin/addons/purchase/purchase_workflow.py	2022-03-17 16:06:51 +0000
@@ -879,6 +879,13 @@
             self.generate_invoice(cr, uid, pol_to_invoice.keys(), context=context)
         return True
 
+    def update_tax_corner(self, cr, uid, ids, context=None):
+        for pol in self.browse(cr, uid, ids, fields_to_fetch=['product_qty', 'price_unit', 'order_id'], context=context):
+            if pol.order_id.tax_line and pol.order_id.amount_untaxed:
+                percent = (pol.product_qty * pol.price_unit) / pol.order_id.amount_untaxed
+            for tax_line in pol.order_id.tax_line:
+                self.pool.get('account.invoice.tax').write(cr, uid, tax_line.id, {'amount': round(tax_line.amount * (1 - percent), 2)}, context=context)
+        return True
 
     def action_cancel(self, cr, uid, ids, context=None):
         '''
@@ -900,6 +907,7 @@
                 if pol.cancelled_by_sync:
                     sol_obj.write(cr, uid, pol.linked_sol_id.id, {'cancelled_by_sync': True}, context=context)
                 wf_service.trg_validate(uid, 'sale.order.line', pol.linked_sol_id.id, 'cancel', cr)
+        self.update_tax_corner(cr, uid, ids, context=context)
         self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
 
         return True
@@ -925,6 +933,7 @@
                     sol_obj.write(cr, uid, pol.linked_sol_id.id, {'cancelled_by_sync': True, 'product_uom_qty': pol.product_qty ,'product_uos_qty': pol.product_qty}, context=context)
                 wf_service.trg_validate(uid, 'sale.order.line', pol.linked_sol_id.id, 'cancel_r', cr)
 
+        self.update_tax_corner(cr, uid, ids, context=context)
         self.write(cr, uid, ids, {'state': 'cancel_r'}, context=context)
 
         return True

=== modified file 'bin/addons/purchase_override/wizard/order_change_currency.py'
--- bin/addons/purchase_override/wizard/order_change_currency.py	2020-08-25 07:39:26 +0000
+++ bin/addons/purchase_override/wizard/order_change_currency.py	2022-03-17 16:06:51 +0000
@@ -78,12 +78,17 @@
         currency_obj = self.pool.get('res.currency')
         line_obj = self.pool.get('purchase.order.line')
         order_obj = self.pool.get('purchase.order')
+        tax_line_obj = self.pool.get('account.invoice.tax')
 
         for wiz in self.browse(cr, uid, ids, context=context):
             for line in wiz.order_id.order_line:
                 new_price = currency_obj.compute(cr, uid, wiz.old_pricelist_id.currency_id.id, wiz.new_pricelist_id.currency_id.id, line.price_unit, round=False, context=context)
                 line_obj.write(cr, uid, line.id, {'price_unit': new_price}, context=c)
 
+            for tax_line in wiz.order_id.tax_line:
+                new_price = currency_obj.compute(cr, uid, wiz.old_pricelist_id.currency_id.id, wiz.new_pricelist_id.currency_id.id, tax_line.amount, round=False, context=context)
+                tax_line_obj.write(cr, uid, tax_line.id, {'amount': new_price}, context=c)
+
             order_data = {'pricelist_id': wiz.new_pricelist_id.id,}
             # Set at least, the functional currency
             currency_ids = [self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id]

=== modified file 'bin/addons/stock/stock.py'
--- bin/addons/stock/stock.py	2022-02-11 14:31:07 +0000
+++ bin/addons/stock/stock.py	2022-03-17 16:06:51 +0000
@@ -1853,6 +1853,21 @@
             for move_line in picking.move_lines:
                 self.action_invoice_create_line(cr, uid, picking, move_line, invoice_id, group, inv_type, partner, context)
 
+            if picking.purchase_id and picking.purchase_id.tax_line:
+                total_po = picking.purchase_id.amount_untaxed
+                total_invoice = invoice_obj.browse(cr, uid, [invoice_id], fields_to_fetch=['amount_untaxed'], context=context)[0].amount_untaxed
+                if total_po and total_invoice:
+                    for tax_line in move_line.purchase_line_id.order_id.tax_line:
+                        self.pool.get('account.invoice.tax').create(cr, uid, {
+                            'invoice_id': invoice_id,
+                            'account_tax_id': tax_line.account_tax_id.id,
+                            'account_id': tax_line.account_id.id,
+                            'partner_id': tax_line.partner_id.id,
+                            'name': tax_line.name,
+                            'base_amount': total_invoice,
+                            'amount': tax_line.amount * total_invoice / total_po}, context=context)
+
+
             invoice_obj.button_compute(cr, uid, [invoice_id], context=context,
                                        set_total=(inv_type in ('in_invoice', 'in_refund')))
             self.write(cr, uid, [picking.id], {