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

[jftempo]

Unmerged revisions

5204. By Dorian on 2019-03-28

US-5523 [FIX] OUT->PICK partner change: Fixed onchange

5203. By Dorian on 2019-03-27

US-5523 [IMP] Added translations

5202. By Dorian on 2019-03-27

US-5523 [MERGE] Merge with trunk

=== modified file 'bin/addons/msf_outgoing/msf_outgoing_view.xml'
--- bin/addons/msf_outgoing/msf_outgoing_view.xml	2019-02-12 08:51:03 +0000
+++ bin/addons/msf_outgoing/msf_outgoing_view.xml	2019-03-28 11:12:04 +0000
@@ -203,9 +203,8 @@
 						<group colspan="4" col="4">
 							<field name="name" readonly="1"/>
 							<field name="origin" readonly="1"/>
-                            <field name="partner_id2" on_change="on_change_partner(partner_id2, address_id)"
-                                                        required="1"
-							attrs="{'readonly': [('state', 'not in', ['draft', 'waiting', 'confirmed', 'assigned'])]}" />
+                            <field name="partner_id2" on_change="on_change_partner(partner_id2, address_id)" required="1"
+									attrs="{'readonly': [('state', 'not in', ['draft', 'waiting', 'confirmed', 'assigned'])]}" />
 							<field name="packing_list" attrs="{'readonly': [('state', 'not in', ['draft', 'confirmed', 'assigned'])]}" />
 							<field name="address_id" colspan="2" context="{'contact_display':'partner'}"
 								   domain="[('partner_id', '=', partner_id2)]"

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-03-04 11:05:48 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-03-28 11:12:04 +0000
@@ -105335,3 +105335,9 @@
 msgstr "\n"
 "                                        Attention: Les lignes suivantes ont des qté ou des montants sur plus de 15 chiffres. Veuillez vérifier la qté et le prix unitaire pour éviter des pertes d'information:\n"
 "                                    "
+
+#. module: stock_override
+#: code:addons/stock_override/stock.py:635
+#, python-format
+msgid "In a PICK from scratch, your are not allowed to choose this type of partner."
+msgstr "Dans un PICK créé à partir de rien, vous n'êtes pas autorisé(e) à choisir ce type de partenaire."

=== modified file 'bin/addons/stock_override/stock.py'
--- bin/addons/stock_override/stock.py	2019-02-11 09:38:43 +0000
+++ bin/addons/stock_override/stock.py	2019-03-28 11:12:04 +0000
@@ -626,6 +626,16 @@
                     },
                 }
 
+            picking = self.browse(cr, uid, ids[0], context=context)
+            if not picking.origin and partner.partner_type in ('internal', 'intermission', 'section'):
+                return {
+                    'value': {'partner_id2': False, 'partner_id': False,},
+                    'warning': {
+                        'title': _('Error'),
+                        'message': _("In a PICK from scratch, your are not allowed to choose this type of partner."),
+                    },
+                }
+
         return {'value': v,
                 'domain': d}