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

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-12-12 10:23:48 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-02-01 15:09:08 +0000
@@ -101136,3 +101136,10 @@
 #, python-format
 msgid "You must select at least one currency of transfers."
 msgstr "Vous devez sélectionner au moins une devise de virement."
+
+#. modules: purchase, sale
+#: code:addons/purchase/purchase_workflow.py:413
+#: code:addons/sale/sale_workflow.py:491
+#, python-format
+msgid "You can't use taxes with an intermission partner."
+msgstr "Vous ne pouvez pas utiliser de taxes avec un partenaire intermission."

=== modified file 'bin/addons/purchase/purchase_workflow.py'
--- bin/addons/purchase/purchase_workflow.py	2017-12-14 17:30:55 +0000
+++ bin/addons/purchase/purchase_workflow.py	2018-02-01 15:09:08 +0000
@@ -400,6 +400,17 @@
 
         return True
 
+    def check_po_tax(self, cr, uid, ids, context=None):
+        """
+        Prevents from validating a PO with taxes when using an Intermission partner
+        """
+        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 == 'intermission':
+                raise osv.except_osv(_('Error'), _("You can't use taxes with an intermission partner."))
 
     def action_validate(self, cr, uid, ids, context=None):
         '''
@@ -415,6 +426,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)
 
         # update FO lines:
         self.update_fo_lines(cr, uid, ids, context=context)

=== modified file 'bin/addons/sale/sale_workflow.py'
--- bin/addons/sale/sale_workflow.py	2018-01-08 13:50:26 +0000
+++ bin/addons/sale/sale_workflow.py	2018-02-01 15:09:08 +0000
@@ -478,6 +478,17 @@
                                                                                   'purchase.order.line.sol_update_original_pol', self._logger, check_identifier=False, context=context)
         return True
 
+    def check_fo_tax(self, cr, uid, ids, context=None):
+        """
+        Prevents from validating a FO with taxes when using an Intermission partner
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        for fo_line in self.browse(cr, uid, ids, fields_to_fetch=['order_id', 'tax_id'], context=context):
+            if fo_line.tax_id and fo_line.order_id.partner_type == 'intermission':
+                raise osv.except_osv(_('Error'), _("You can't use taxes with an intermission partner."))
 
     def action_validate(self, cr, uid, ids, context=None):
         '''
@@ -488,6 +499,8 @@
         if isinstance(ids, (int, long)):
             ids = [ids] 
 
+        self.check_fo_tax(cr, uid, ids, context=context)
+
         for sol in self.browse(cr, uid, ids, context=context):
             to_write = {}
             if not sol.stock_take_date and sol.order_id.stock_take_date: