Merge lp:~dorian-kemps/unifield-server/US-10067-10068 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2022-08-23 13:15:58 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2022-09-13 15:34:42 +0000
@@ -17188,14 +17188,25 @@
 msgid "Warning!"
 msgstr "Avertissement!"
 
-#. modules: purchase, sale, account_override
-#: code:addons/purchase/purchase_workflow.py:549
+#. modules: sale, account_override
 #: code:addons/sale/sale_workflow.py:529
 #: code:addons/account_override/invoice.py:829
 #, python-format
 msgid "Taxes are forbidden with Intermission and Intersection partners."
 msgstr "Les taxes sont interdites avec les partenaires Intermission et Intersection."
 
+#. modules: purchase
+#: code:addons/purchase/purchase_workflow.py:549
+#, python-format
+msgid "Taxes are forbidden with Internal, Intermission and Intersection partners."
+msgstr "Les taxes sont interdites avec les partenaires Interne, Intermission et Intersection."
+
+#. modules: purchase
+#: code:addons/purchase/purchase_workflow.py:607
+#, python-format
+msgid "Taxes are forbidden with the In Kind Donation Order Type."
+msgstr "Les taxes sont interdites avec le Type de Commande Donation en Nature."
+
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 
=== modified file 'bin/addons/purchase/purchase_view.xml'
--- bin/addons/purchase/purchase_view.xml	2022-08-09 15:41:58 +0000
+++ bin/addons/purchase/purchase_view.xml	2022-09-13 15:34:42 +0000
@@ -388,7 +388,7 @@
                                 </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)]}">
+                                <field name="tax_line" nolabel="1" attrs="{'invisible': ['|', ('partner_type', '!=', 'external'), ('order_type', '=', 'in_kind')], '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"/>
@@ -698,7 +698,8 @@
                             </group>
 
                             <field name="vat_ok" invisible="1"/>
-                            <group colspan="4" col="4" attrs="{'invisible': [('vat_ok', '=', False)]}">
+                            <field name="po_partner_type_stored" invisible="1"/>
+                            <group colspan="4" col="4" attrs="{'invisible': ['|', '|', ('vat_ok', '=', False), ('po_partner_type_stored', '=', 'internal'), ('po_order_type', '=', 'in_kind')]}">
                                 <separator colspan="4" string="Taxes"/>
                                 <field colspan="4" nolabel="1" name="taxes_id" domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
                             </group>
 
=== modified file 'bin/addons/purchase/purchase_workflow.py'
--- bin/addons/purchase/purchase_workflow.py	2022-04-06 16:04:57 +0000
+++ bin/addons/purchase/purchase_workflow.py	2022-09-13 15:34:42 +0000
@@ -47,7 +47,7 @@
             self.check_analytic_distribution(cr, uid, ids_to_check, context=context)
             self.check_if_stock_take_date_with_esc_partner(cr, uid, ids_to_check, context=context)
             self.check_unit_price(cr, uid, ids_to_check, context=context)
-            self.check_po_tax(cr, uid, ids_to_check, context=context)
+            self.check_pol_tax(cr, uid, ids_to_check, context=context)
             wiz_id = self.pool.get('purchase.order.line.nsl.validation.wizard').create(cr, uid, {'pol_ids': [(6, 0, ids)], 'message': ', '.join(nsl)}, context=context)
             return {
                 'type': 'ir.actions.act_window',
@@ -591,17 +591,20 @@
 
         return True
 
-    def check_po_tax(self, cr, uid, ids, context=None):
+    def check_pol_tax(self, cr, uid, ids, context=None):
         """
-        Prevents from validating a PO with taxes when using an Intermission or Intersection partner
+        Prevents from validating a PO line with taxes when using an Internal, Intermission or Intersection partner; and
+        with an In Kind Donation Order Type
         """
         if context is None:
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
         for po_line in self.browse(cr, uid, ids, fields_to_fetch=['order_id', 'taxes_id'], context=context):
-            if po_line.taxes_id and po_line.order_id.partner_type in ('intermission', 'section'):
-                raise osv.except_osv(_('Error'), _("Taxes are forbidden with Intermission and Intersection partners."))
+            if po_line.taxes_id and po_line.order_id.partner_type in ('internal', 'intermission', 'section'):
+                raise osv.except_osv(_('Error'), _("Taxes are forbidden with Internal, Intermission and Intersection partners."))
+            if po_line.taxes_id and po_line.order_id.order_type == 'in_kind':
+                raise osv.except_osv(_('Error'), _("Taxes are forbidden with the In Kind Donation Order Type."))
 
     def check_origin_for_validation(self, cr, uid, ids, context=None):
         if not context:
@@ -636,7 +639,7 @@
         self.check_analytic_distribution(cr, uid, ids, context=context)
         self.check_if_stock_take_date_with_esc_partner(cr, uid, ids, context=context)
         self.check_unit_price(cr, uid, ids, context=context)
-        self.check_po_tax(cr, uid, ids, context=context)
+        self.check_pol_tax(cr, uid, ids, context=context)
 
         # update FO lines:
         self.update_fo_lines(cr, uid, ids, context=context)
@@ -956,7 +959,7 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
 
-        po = self.browse(cr, uid, ids[0], context=context)
+        po = self.browse(cr, uid, ids[0], fields_to_fetch=['order_line'], context=context)
         return self.pool.get('purchase.order.line').validated(cr, uid, [pol.id for pol in po.order_line], context=context)