Merge lp:~mallorymarcot/unifield-server/us-5523 into lp:~jfb-tempo-consulting/unifield-server/trunk

[jftempo]

=== modified file 'bin/addons/msf_outgoing/msf_outgoing_view.xml'
--- bin/addons/msf_outgoing/msf_outgoing_view.xml	2018-11-07 14:53:50 +0000
+++ bin/addons/msf_outgoing/msf_outgoing_view.xml	2019-02-28 18:44:53 +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/stock_override/stock.py'
--- bin/addons/stock_override/stock.py	2018-11-29 17:09:45 +0000
+++ bin/addons/stock_override/stock.py	2019-02-28 18:44:53 +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', 'intersection'):
+                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}