Merge lp:~unifield-team/unifield-server/us-1108 into lp:unifield-server

[Quentin THEURET @Amaris]

=== modified file 'bin/addons/delivery_mechanism/delivery_mechanism.py'
--- bin/addons/delivery_mechanism/delivery_mechanism.py	2016-08-23 12:54:03 +0000
+++ bin/addons/delivery_mechanism/delivery_mechanism.py	2016-10-28 12:28:13 +0000
@@ -1375,9 +1375,13 @@
                 res_wiz = wiz_obj.do_create_picking(cr, uid, [wiz['res_id']], context=wiz_context)
                 if 'res_id' in res_wiz:
                     new_pick_id = res_wiz['res_id']
+                    if new_pick_id:
+                        self.write(cr, uid, new_pick_id, {'incoming_id': backorder_id or picking_dict['id']}, context=context)
                     if backorder_id and new_pick_id:
                         new_pick_name = self.read(cr, uid, new_pick_id, ['name'], context=context)['name']
-                        self.write(cr, uid, backorder_id, {'associate_pick_name': new_pick_name,}, context=context)
+                        self.write(cr, uid, backorder_id, {
+                            'associate_pick_name': new_pick_name,
+                        }, context=context)
 
             prog_id = self.update_processing_info(cr, uid, picking_id, prog_id, {
                 'prepare_pick': _('Done'),
 
=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py	2016-10-25 07:49:35 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py	2016-10-28 12:28:13 +0000
@@ -1875,6 +1875,10 @@
             default = {}
         if context is None:
             context = {}
+
+        if 'incoming_id' not in default:
+            default['incoming_id'] = False
+
         obj = self.browse(cr, uid, copy_id, context=context)
         if not context.get('allow_copy', False):
             if obj.subtype == 'picking' and default.get('subtype', 'picking') == 'picking':
 
=== modified file 'bin/addons/msf_outgoing/msf_outgoing_view.xml'
--- bin/addons/msf_outgoing/msf_outgoing_view.xml	2016-05-30 07:12:04 +0000
+++ bin/addons/msf_outgoing/msf_outgoing_view.xml	2016-10-28 12:28:13 +0000
@@ -152,6 +152,7 @@
 					<field name="sale_id" invisible="True" />
 					<field name="reason_type_id" />
 					<field name="origin"/>
+					<field name="incoming_id" />
 					<field name="overall_qty" invisible="True" />
 					<field name="date"/>
 					<field name="min_date" string="Expected Pick Date" />
@@ -202,6 +203,7 @@
 								   attrs="{'required': [('subtype', 'in', ('picking', 'ppl'))], 'readonly': [('partner_id2', '=', False)]}" />
 							<field name="backorder_id" readonly="1" />
 							<field name="reason_type_id" widget="selection" domain="[('outgoing_ok', '=', True)]" attrs="{'readonly': [('from_wkf', '=', True)]}"/>
+							<field name="incoming_id" readonly="True" />
 						</group>
 						<group colspan="2" col="2">
 							<field name="date" readonly="1"/>
 
=== modified file 'bin/addons/msf_outgoing/report/picking_ticket.rml'
--- bin/addons/msf_outgoing/report/picking_ticket.rml	2016-07-28 12:32:01 +0000
+++ bin/addons/msf_outgoing/report/picking_ticket.rml	2016-10-28 12:28:13 +0000
@@ -120,7 +120,7 @@
 
         <!-- Picking Ticket header values -->
 
-        <blockTable colWidths="20.0,60.0,235.0,5.0,80.0,120.0,5.0,242.0,80.0" style="HeaderInfos">
+        <blockTable colWidths="20.0,70.0,225.0,5.0,80.0,120.0,5.0,242.0,80.0" style="HeaderInfos">
             <tr>
                 <td>
                     <para style="HeaderInfosTitle"></para>
@@ -128,12 +128,14 @@
                 <td>
                     <para style="HeaderInfosTitle">FO ref.:</para>
                     <para style="HeaderInfosTitle">Origin ref.:</para>
+                    <para style="HeaderInfosTitle">Incoming ref:</para>
                     <para style="HeaderInfosTitle">Category:</para>
                     <para style="HeaderInfosTitle">Total items:</para>
                 </td>
                 <td>
                     <para style="HeaderInfosValue">[[ pt.sale_id and pt.sale_id.name or '-' ]]</para>
                     <para style="HeaderInfosValue">[[ pt.sale_id and pt.sale_id.client_order_ref and pt.sale_id.client_order_ref or '-' ]]</para>
+                    <para style="HeaderInfosValue">[[ pt.incoming_id.name or '-' ]]</para>
                     <para style="HeaderInfosValue">[[ pt.sale_id and getSel(pt.sale_id, 'categ') or '-' ]]</para>
                     <para style="HeaderInfosValue">[[ getNbItems(pt) ]]</para>
                 </td>
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2016-10-25 09:13:52 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2016-10-28 12:28:13 +0000
@@ -74617,6 +74617,7 @@
 "	Number of columns is not equal to %s"
 msgstr "\n"
 "	Le nombre de colonnes n'est pas égal à %s"
+<<<<<<< TREE
 
 #. module: specific_rules
 #: report:addons/specific_rules/report/report_stock_inventory_all_locations_xls.mako:143
@@ -74689,3 +74690,10 @@
 msgid "You can't search on this object without using at least one exact search term (precede your search with the character '=')."
 msgstr "Vous ne pouvez pas exécuter de recherche sur cet objet sans utiliser au moins une recherche exacte (ajoutez le caractère = devant votre filtre)."
 
+=======
+
+#. module: stock_override
+#: field:stock.picking,incoming_id:0
+msgid "Incoming ref"
+msgstr "Ref. Réception"
+>>>>>>> MERGE-SOURCE
 
=== modified file 'bin/addons/stock_override/stock.py'
--- bin/addons/stock_override/stock.py	2016-08-26 12:47:12 +0000
+++ bin/addons/stock_override/stock.py	2016-10-28 12:28:13 +0000
@@ -366,7 +366,8 @@
             store={
                 'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['partner_id2'], 10),
             }
-        )
+        ),
+        'incoming_id': fields.many2one('stock.picking', string='Incoming ref', readonly=True),
     }
 
     _defaults = {'from_yml_test': lambda *a: False,
 
=== modified file 'bin/addons/stock_override/stock_view.xml'
--- bin/addons/stock_override/stock_view.xml	2016-08-03 12:08:12 +0000
+++ bin/addons/stock_override/stock_view.xml	2016-10-28 12:28:13 +0000
@@ -313,6 +313,7 @@
                                    domain="[('internal_ok', '=', True)]" 
                                    attrs="{'readonly': [('state', 'not in', ('draft', 'confirmed', 'assigned'))]}"/>
                             <field name="order_category"/>
+                            <field name="incoming_id" />
                         </group>
                         <group colspan="2" col="2">
                             <field name="date" attrs="{'readonly': [('state', 'not in', ['draft', 'auto', 'assigned', 'confirmed'])]}"/>