Merge lp:~mallorymarcot/unifield-server/us-5090 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-04-08 09:30:07 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-04-24 15:17:54 +0000
@@ -102489,6 +102489,12 @@
 msgid " goods products, please refer to the appropriate procedures"
 msgstr " veuillez vous référer aux procédures adéquates."
 
+#. module: product_attributes
+#: code:addons/product_attributes/product_attributes.py:1238
+#, python-format
+msgid "Batch and Expiry attributes do not conform"
+msgstr "Le numéro de lot et la date d'expiration ne sont pas conformes"
+
 #. module: specific_rules
 #: view:export.report.stock.inventory:0
 msgid "Generate report (product list)"

=== modified file 'bin/addons/product_attributes/product_attributes.py'
--- bin/addons/product_attributes/product_attributes.py	2019-01-30 10:46:44 +0000
+++ bin/addons/product_attributes/product_attributes.py	2019-04-24 15:17:54 +0000
@@ -1219,6 +1219,13 @@
                         'res_id': res_id,
                     }, context=context)
 
+        if 'batch_management' in vals and 'perishable' in vals and context.get('from_import_menu'):
+            if vals['batch_management'] and not vals['perishable']:
+                raise osv.except_osv(
+                    _('Error'),
+                    _('Batch and Expiry attributes do not conform')
+                )
+
         if 'default_code' in vals:
             if not context.get('sync_update_execution'):
                 vals['default_code'] = vals['default_code'].strip()