Merge lp:~unifield-team/unifield-server/us-1125 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-11-09 08:29:21 +0000
@@ -783,6 +783,7 @@
             'prodlot_id': line.prodlot_id and line.prodlot_id.id or False,
             'asset_id': line.asset_id and line.asset_id.id or False,
             'change_reason': line.change_reason,
+            'comment': line.comment or move.comment,
             # Values from incoming wizard
             'direct_incoming': line.wizard_id.direct_incoming,
             # Values for Direct Purchase Order
@@ -850,7 +851,7 @@
 
         if wizard.dest_type != 'to_cross_docking':
             values['direct_incoming'] = wizard.direct_incoming
-
+            
         return values
 
     def update_processing_info(self, cr, uid, picking_id, prog_id=False, values=None, context=None):
@@ -1598,13 +1599,14 @@
         # give the purchase order line a link to corresponding procurement
         procurement = kwargs['procurement']
         line.update({'procurement_id': procurement.id, })
+
         # for Internal Request (IR) on make_to_order we update PO line data according to the data of the IR (=sale_order)
         sale_order_line_ids = sale_obj.search(cr, uid, [('procurement_id', '=', procurement.id)], context=context)
         for sol in sale_obj.browse(cr, uid, sale_order_line_ids, context=context):
             if (sol.order_id.procurement_request or procurement.supplier.partner_type == 'esc') and not sol.product_id and sol.comment:
                 line.update({'product_id': False,
                              'name': 'Description: %s' % sol.comment,
-                             'comment': sol.comment,
+                             'comment': procurement.tender_line_id and procurement.tender_line_id.comment or sol.comment,
                              'product_qty': sol.product_uom_qty,
                              'price_unit': sol.price_unit,
                              'date_planned': sol.date_planned,
@@ -1619,6 +1621,10 @@
                              'nomen_sub_3': sol.nomen_sub_3.id or False,
                              'nomen_sub_4': sol.nomen_sub_4.id or False,
                              'nomen_sub_5': sol.nomen_sub_5.id or False})
+
+        if procurement.tender_line_id and procurement.tender_line_id.purchase_order_line_id and procurement.tender_line_id.purchase_order_line_id.comment:
+            line['comment'] = procurement.tender_line_id.purchase_order_line_id.comment
+
         return line
 
 procurement_order()
 
=== 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-11-09 08:29:21 +0000
@@ -4931,14 +4931,15 @@
                 '_name'::varchar(5) as name,
                 min(pl.currency_id) as currency_id,
                 sum(sol.price_unit * m.product_qty) as total_amount,
-                bool_and(m.not_shipped) as not_shipped
+                bool_and(m.not_shipped) as not_shipped,
+                m.comment as comment
             from stock_picking p
             inner join stock_move m on m.picking_id = p.id and m.state != 'cancel' and m.product_qty > 0
             left join sale_order so on so.id = p.sale_id
             left join sale_order_line sol on sol.id = m.sale_line_id
             left join product_pricelist pl on pl.id = so.pricelist_id
             where p.shipment_id is not null
-            group by p.shipment_id, p.description_ppl, to_pack, sale_id, p.subtype, p.id, p.previous_step_id
+            group by p.shipment_id, p.description_ppl, to_pack, sale_id, p.subtype, p.id, p.previous_step_id, m.comment
     )
     ''')
 
@@ -5033,6 +5034,7 @@
         'total_volume': fields.function(_vals_get, method=True, type='float', string=u'Total Volume[dm³]', multi='get_vals',),
         'description_ppl': fields.char('Description', size=256),
         'not_shipped': fields.boolean(string='Not shipped'),
+        'comment': fields.char(string='Comment', size=1024)
     }
 
     _defaults = {
 
=== 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-11-09 08:29:21 +0000
@@ -227,6 +227,7 @@
 								<tree string="Stock Moves" noteditable="fake_state in ('assigned', 'cancel')" hide_new_button="context.get('from_wkf')" hide_delete_button="True"
 								colors="red: inactive_product==True">
                                     <field name="product_id" context="{'available_for_restriction': 'picking', 'search_default_not_restricted': 1}"/>
+                                    <field name="comment" />
 									<field name="composition_list_id" />
 									<field name="product_qty" string="Qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
 									<field name="product_uom" string="UoM"/>
@@ -279,6 +280,7 @@
 											domain="[('uom_by_product', '=', product_id)]"
 											 />
 										<field name="product_packaging"  domain="[('product_id','=',product_id)]" colspan="4" invisible="1" />
+										<field name="comment" colspan="4" />
 									</group>
 									<group colspan="2" col="2">
 										<separator string="Locations" colspan="2" />
@@ -612,6 +614,7 @@
 							<field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines and [move_lines[-1]] or [], 'address_out_id': address_id}"  attrs="{'readonly': [ ('from_wkf', '=', True),('state','in',['draft','confirmed','assigned']) ]}" >
 								<tree string="Stock Moves" hide_new_button="True" colors="red: inactive_product==True">
                                     <field name="product_id" context="{'available_for_restriction': 'picking', 'search_default_not_restricted': 1}" />
+                                    <field name="comment" />
 									<field name="composition_list_id" />
 									<field name="product_qty" string="Qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
 									<field name="product_uom" string="UoM"/>
@@ -649,9 +652,10 @@
                                         <field name="composition_list_id" invisible="True" />
 										<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" />
 										<field name="product_uom" string="Unit Of Measure" colspan="2" domain="[('uom_by_product', '=', product_id)]"/>
-										<field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4" />
-										<field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4" />
+										<field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" />
+										<field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="2" />
 										<field name="product_packaging"  domain="[('product_id','=',product_id)]" colspan="4" invisible="1" />
+										<field name="comment" colspan="4" />
 									</group>
 									<group colspan="2" col="2">
 										<separator string="Locations" colspan="2" />
@@ -1267,6 +1271,7 @@
 									<field name="location_id" />
 									<field name="location_dest_id" />
 									<field name="state" />
+									<field name="comment" />
 									<field name="move_lines" nolabel="True" colspan="4" mode="tree" readonly="True">
 										<tree colors="red: inactive_product==True">
 											<field name="name" />
 
=== modified file 'bin/addons/msf_outgoing/report/empty_picking_ticket.rml'
--- bin/addons/msf_outgoing/report/empty_picking_ticket.rml	2016-07-28 12:34:28 +0000
+++ bin/addons/msf_outgoing/report/empty_picking_ticket.rml	2016-11-09 08:29:21 +0000
@@ -58,6 +58,17 @@
             <blockBackground colorName="#c0c0c0" start="0,1" stop="-1,-1" />
             <lineStyle kind="OUTLINE" colorName="black" start="-5,0" stop="-1,0" />
             <lineStyle kind="GRID" colorName="black" start="0,1" stop="-1,-1" />
+            <blockSpan start="0,1" stop="0,-1" />
+            <blockSpan start="3,1" stop="3,-1" />
+            <blockSpan start="4,1" stop="4,-1" />
+            <blockSpan start="5,1" stop="5,-1" />
+            <blockSpan start="6,1" stop="6,-1" />
+            <blockSpan start="7,1" stop="7,-1" />
+            <blockSpan start="8,1" stop="8,-1" />
+            <blockSpan start="9,1" stop="9,-1" />
+            <blockSpan start="10,1" stop="10,-1" />
+            <blockSpan start="11,1" stop="11,-1" />
+            <blockSpan start="12,1" stop="12,-1" />
         </blockTableStyle>
 
         <blockTableStyle id="LinesValues">
@@ -251,6 +262,50 @@
                     <para style="LineHeader">(w x l x h) (cm)</para>
                 </td>
             </tr>
+            <tr>
+                <td>
+                    <para style="LineHeader"></para>
+                </td>
+                <td>
+                    <para style="LineHeaderLeft"></para>
+                </td>
+                <td>
+                    <para style="LineHeaderLeft">Comment</para>
+                </td>
+                <td>
+                    <para style="LineHeader"></para>
+                </td>
+                <td>
+                    <para style="LineHeader"></para>
+                </td>
+                <td>
+                    <para style="LineHeader"></para>
+                </td>
+                <td>
+                    <para style="LineHeader"></para>
+                </td>
+                <td>
+                    <para style="LineHeader"></para>
+                </td>
+                <td>
+                    <para style="LineHeader"></para>
+                </td>
+                <td>
+                    <para style="LineHeader"></para>
+                </td>
+                <td>
+                    <para style="LineHeader"></para>
+                </td>
+                <td>
+                    <para style="LineHeader"></para>
+                </td>
+                <td>
+                    <para style="LineHeader"></para>
+                </td>
+                <td>
+                    <para style="LineHeader"></para>
+                </td>
+            </tr>
         </blockTable>
 
         <pto>
@@ -344,6 +399,50 @@
                             <para style="LineHeader">Size (w x l x h) (cm)</para>
                         </td>
                     </tr>
+                    <tr>
+                        <td>
+                            <para style="LineHeader"></para>
+                        </td>
+                        <td>
+                            <para style="LineHeaderLeft"></para>
+                        </td>
+                        <td>
+                            <para style="LineHeaderLeft">Comment</para>
+                        </td>
+                        <td>
+                            <para style="LineHeader"></para>
+                        </td>
+                        <td>
+                            <para style="LineHeader"></para>
+                        </td>
+                        <td>
+                            <para style="LineHeader"></para>
+                        </td>
+                        <td>
+                            <para style="LineHeader"></para>
+                        </td>
+                        <td>
+                            <para style="LineHeader"></para>
+                        </td>
+                        <td>
+                            <para style="LineHeader"></para>
+                        </td>
+                        <td>
+                            <para style="LineHeader"></para>
+                        </td>
+                        <td>
+                            <para style="LineHeader"></para>
+                        </td>
+                        <td>
+                            <para style="LineHeader"></para>
+                        </td>
+                        <td>
+                            <para style="LineHeader"></para>
+                        </td>
+                        <td>
+                            <para style="LineHeader"></para>
+                        </td>
+                    </tr>
                 </blockTable>
             </pto_header>
 
@@ -409,7 +508,7 @@
                         <para style="LineValue"></para>
                     </td>
                     <td>
-                        <para style="LineValue"></para>
+                        <para style="LineValueLeft">[[ m.comment ]]</para>
                     </td>
                     <td>
                         <para style="LineValue"></para>
 
=== modified file 'bin/addons/msf_outgoing/report/packing_list.rml'
--- bin/addons/msf_outgoing/report/packing_list.rml	2016-03-22 08:24:13 +0000
+++ bin/addons/msf_outgoing/report/packing_list.rml	2016-11-09 08:29:21 +0000
@@ -252,7 +252,7 @@
                                 <para style="ParcelLineValue">[[ m.product_id.name ]]</para>
                             </td>
                             <td>
-                                <para style="ParcelLineValue">[[ m.sale_line_id and m.sale_line_id.notes or '' ]]</para>
+                                <para style="ParcelLineValue">[[ m.comment or '' ]]</para>
                             </td>
                             <td>
                                 <para style="ParcelLineValue">[[ formatLang(m.product_qty or 0.00) ]] [[ m.product_uom.name ]]</para>
 
=== modified file 'bin/addons/msf_outgoing/report/packing_list_xls.mako'
--- bin/addons/msf_outgoing/report/packing_list_xls.mako	2016-03-22 08:24:13 +0000
+++ bin/addons/msf_outgoing/report/packing_list_xls.mako	2016-11-09 08:29:21 +0000
@@ -441,7 +441,7 @@
        <Cell ss:StyleID="s134"><Data ss:Type="Number">${(m.line_number)|x}</Data></Cell>
        <Cell ss:StyleID="s134"><Data ss:Type="String">${(m.product_id.default_code)|x}</Data></Cell>
        <Cell ss:StyleID="s134"><Data ss:Type="String">${(m.product_id.name)|x}</Data></Cell>
-       <Cell ss:StyleID="s134" ss:MergeAcross="2"><Data ss:Type="String">${(m.sale_line_id and m.sale_line_id.notes or '')|x}</Data></Cell>
+       <Cell ss:StyleID="s134" ss:MergeAcross="2"><Data ss:Type="String">${(m.comment or '')|x}</Data></Cell>
        <Cell ss:StyleID="s134"><Data ss:Type="String">${(formatLang(m.product_qty or 0.00))|x} ${(m.product_uom.name)|x}</Data></Cell>
        <Cell ss:StyleID="s134"><Data ss:Type="String">${(m.prodlot_id.name or '')|x}</Data></Cell>
        % if m.prodlot_id.life_date and m.prodlot_id.life_date not in (False, 'False'):
 
=== modified file 'bin/addons/msf_outgoing/report/picking_ticket.py'
--- bin/addons/msf_outgoing/report/picking_ticket.py	2016-07-28 12:32:01 +0000
+++ bin/addons/msf_outgoing/report/picking_ticket.py	2016-11-09 08:29:21 +0000
@@ -36,6 +36,7 @@
         self.sale_line_id = move.sale_line_id
         self.product_uom = move.product_id.uom_id
         self.state = move.state
+        self.comment = move.comment
         self.product_qty = 0.00
         self.prodlot_id = None
         self.kc_check = False
 
=== 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-11-09 08:29:21 +0000
@@ -414,7 +414,7 @@
                         <para style="LineValue"></para>
                     </td>
                     <td>
-                        <para style="LineValueLeft">[[ m.sale_line_id and m.sale_line_id.notes or '' ]]</para>
+                        <para style="LineValueLeft">[[ m.comment or '' ]]</para>
                     </td>
                     <td>
                         <para style="LineValueLeft">[[ m.sale_line_id and m.sale_line_id.product_id != m.product_id and '[%s] %s' % (m.product_id.default_code, m.product_id.name) or '' ]]</para>
 
=== modified file 'bin/addons/msf_outgoing/wizard/create_picking_processor.py'
--- bin/addons/msf_outgoing/wizard/create_picking_processor.py	2016-03-08 15:48:47 +0000
+++ bin/addons/msf_outgoing/wizard/create_picking_processor.py	2016-11-09 08:29:21 +0000
@@ -103,6 +103,18 @@
             help="Expected product to receive",
             multi='move_info',
         ),
+        'comment': fields.function(
+            _get_move_info,
+            method=True,
+            string='Comment',
+            type='text',
+            store={
+                'create.picking.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['move_id'], 20),
+            },
+            readonly=True,
+            help="Comment of the move",
+            multi='move_info',
+        ),
         'ordered_uom_id': fields.function(
             _get_move_info,
             method=True,
 
=== modified file 'bin/addons/msf_outgoing/wizard/create_picking_processor_view.xml'
--- bin/addons/msf_outgoing/wizard/create_picking_processor_view.xml	2016-03-17 08:30:04 +0000
+++ bin/addons/msf_outgoing/wizard/create_picking_processor_view.xml	2016-11-09 08:29:21 +0000
@@ -46,6 +46,7 @@
                     <!-- Visible fields -->
                     <field name="line_number" string="Line" />
                     <field name="product_id" string="Product" />
+                    <field name="comment" readonly="1" />
                     <button name="open_change_product_wizard"
                             type="object"
                             icon="gtk-convert"
 
=== modified file 'bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py'
--- bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py	2016-07-25 08:20:05 +0000
+++ bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py	2016-11-09 08:29:21 +0000
@@ -488,6 +488,15 @@
                 res[id] = False
         return res
 
+    def _set_comment(self, cr, uid, ml_id, name=None, value=None, fnct_inv_arg=None, context=None):
+        """
+        Just used to not break default OpenERP behaviour
+        """
+        if name and value:
+            sql = "UPDATE "+ self._table + " SET " + name + " = %s WHERE id = %s"
+            cr.execute(sql, (value, ml_id))
+        return True
+
     _columns = {
         # Parent wizard
         'wizard_id': fields.many2one(
@@ -512,6 +521,19 @@
             help="Expected product to receive",
             multi='move_info',
         ),
+        'comment': fields.function(
+            _get_move_info,
+            fnct_inv=_set_comment,
+            method=True,
+            string='Comment',
+            type='text',
+            store={
+                'stock.move.in.processor': (lambda self, cr, uid, ids, c=None: ids, ['move_id'], 20),
+            },
+            readonly=True,
+            help="Comment of the move",
+            multi='move_info',
+        ),
         'ordered_uom_id': fields.function(
             _get_move_info,
             method=True,
 
=== modified file 'bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml'
--- bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml	2016-03-17 08:30:04 +0000
+++ bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml	2016-11-09 08:29:21 +0000
@@ -111,6 +111,7 @@
                     <!-- Visible fields -->
                     <field name="line_number" string="Line" />
                     <field name="product_id" string="Product" />
+                    <field name="comment" readonly="1" />
                     <field name="batch_location_ids" invisible="1" />
                     <button name="open_change_product_wizard"
                         type="object"
 
=== modified file 'bin/addons/msf_outgoing/wizard/internal_move_processor.py'
--- bin/addons/msf_outgoing/wizard/internal_move_processor.py	2016-03-08 15:48:47 +0000
+++ bin/addons/msf_outgoing/wizard/internal_move_processor.py	2016-11-09 08:29:21 +0000
@@ -402,6 +402,18 @@
             help="Expected product to receive",
             multi='move_info',
         ),
+        'comment': fields.function(
+            _get_move_info,
+            method=True,
+            string='Comment',
+            type='text',
+            store={
+                'internal.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['move_id'], 20),
+            },
+            readonly=True,
+            help="Comment of the move",
+            multi='move_info',
+        ),
         'ordered_uom_id': fields.function(
             _get_move_info,
             method=True,
 
=== modified file 'bin/addons/msf_outgoing/wizard/internal_move_processor_view.xml'
--- bin/addons/msf_outgoing/wizard/internal_move_processor_view.xml	2016-03-17 08:37:36 +0000
+++ bin/addons/msf_outgoing/wizard/internal_move_processor_view.xml	2016-11-09 08:29:21 +0000
@@ -66,6 +66,7 @@
                     <!-- Visible fields -->
                     <field name="line_number" string="Line" />
                     <field name="product_id" string="Product" />
+                    <field name="comment" readonly="1" />
                     <button name="open_change_product_wizard"
                             type="object"
                             icon="gtk-convert"
 
=== modified file 'bin/addons/msf_outgoing/wizard/outgoing_delivery_processor.py'
--- bin/addons/msf_outgoing/wizard/outgoing_delivery_processor.py	2016-03-08 15:48:47 +0000
+++ bin/addons/msf_outgoing/wizard/outgoing_delivery_processor.py	2016-11-09 08:29:21 +0000
@@ -190,6 +190,18 @@
             help="Expected product to receive",
             multi='move_info',
         ),
+        'comment': fields.function(
+            _get_move_info,
+            method=True,
+            string='Comment',
+            type='text',
+            store={
+                'outgoing.delivery.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['move_id'], 20),
+            },
+            readonly=True,
+            help="Comment of the move",
+            multi='move_info',
+        ),
         'ordered_uom_id': fields.function(
             _get_move_info,
             method=True,
 
=== modified file 'bin/addons/msf_outgoing/wizard/outgoing_delivery_processor_view.xml'
--- bin/addons/msf_outgoing/wizard/outgoing_delivery_processor_view.xml	2016-03-17 08:37:36 +0000
+++ bin/addons/msf_outgoing/wizard/outgoing_delivery_processor_view.xml	2016-11-09 08:29:21 +0000
@@ -46,6 +46,7 @@
                     <!-- Visible fields -->
                     <field name="line_number" string="Line" />
                     <field name="product_id" string="Product" />
+                    <field name="comment" readonly="1" />
                     <button name="open_change_product_wizard"
                             type="object"
                             icon="gtk-convert"
 
=== modified file 'bin/addons/msf_outgoing/wizard/picking_processor.py'
--- bin/addons/msf_outgoing/wizard/picking_processor.py	2016-08-18 08:32:03 +0000
+++ bin/addons/msf_outgoing/wizard/picking_processor.py	2016-11-09 08:29:21 +0000
@@ -238,7 +238,7 @@
 
         for line in self.browse(cr, uid, ids, context=context):
             # Return an error if the move has no product defined
-            if not line.move_id.product_id:
+            if not line.move_id or not line.move_id.product_id:
                 raise osv.except_osv(
                     _('Data Error'),
                     _('The move you are trying to process has no product defined - Please set a product on it before process it.')
@@ -268,6 +268,7 @@
                 'location_id': location_id,
                 'location_supplier_customer_mem_out': loc_supplier or loc_cust or valid_pt,
                 'type_check': line.move_id.picking_id.type,
+                'comment': line.move_id.comment,
             }
 
         return res
@@ -452,6 +453,18 @@
             help="Expected product to receive",
             multi='move_info',
         ),
+        'comment': fields.function(
+            _get_move_info,
+            method=True,
+            string='Comment',
+            type='text',
+            store={
+                'stock.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['move_id'], 20),
+            },
+            readonly=True,
+            help="Comment of the move",
+            multi='move_info',
+        ),
         'quantity': fields.float(
             string='Quantity',
             digits_compute=dp.get_precision('Product UoM'),
 
=== modified file 'bin/addons/msf_outgoing/wizard/picking_processor_view.xml'
--- bin/addons/msf_outgoing/wizard/picking_processor_view.xml	2016-03-17 08:37:36 +0000
+++ bin/addons/msf_outgoing/wizard/picking_processor_view.xml	2016-11-09 08:29:21 +0000
@@ -46,6 +46,7 @@
                     <!-- Visible fields -->
                     <field name="line_number" string="Line" />
                     <field name="product_id" string="Product" />
+                    <field name="comment" readonly="1" />
                     <button name="open_change_product_wizard"
                             type="object"
                             icon="gtk-convert"
 
=== modified file 'bin/addons/msf_outgoing/wizard/ppl_processor.py'
--- bin/addons/msf_outgoing/wizard/ppl_processor.py	2016-08-18 08:32:03 +0000
+++ bin/addons/msf_outgoing/wizard/ppl_processor.py	2016-11-09 08:29:21 +0000
@@ -440,6 +440,18 @@
             help="Expected product to receive",
             multi='move_info',
         ),
+        'comment': fields.function(
+             _get_move_info,
+             method=True,
+             string='Comment',
+             type='text',
+             store={
+                 'ppl.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['move_id'], 20),
+             },
+             readonly=True,
+             help="Comment of the move",
+             multi='move_info',
+        ),
         'ordered_uom_id': fields.function(
             _get_move_info,
             method=True,
 
=== modified file 'bin/addons/msf_outgoing/wizard/ppl_processor_view.xml'
--- bin/addons/msf_outgoing/wizard/ppl_processor_view.xml	2016-03-17 08:37:36 +0000
+++ bin/addons/msf_outgoing/wizard/ppl_processor_view.xml	2016-11-09 08:29:21 +0000
@@ -66,6 +66,7 @@
                            string="Product"
                            readonly="1"
                            />
+                    <field name="comment" readonly="1" />
                     <field name="asset_id" readonly="1" />
                     <field name="composition_list_id" readonly="1" />
                     <field name="quantity"
 
=== modified file 'bin/addons/msf_outgoing/wizard/return_ppl_processor.py'
--- bin/addons/msf_outgoing/wizard/return_ppl_processor.py	2016-03-08 15:48:47 +0000
+++ bin/addons/msf_outgoing/wizard/return_ppl_processor.py	2016-11-09 08:29:21 +0000
@@ -142,6 +142,18 @@
             help="Expected product to receive",
             multi='move_info',
         ),
+        'comment': fields.function(
+            _get_move_info,
+            method=True,
+            string='Comment',
+            type='text',
+            store={
+                'return.ppl.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['move_id'], 20),
+            },
+            readonly=True,
+            help="Comment of the move",
+            multi='move_info',
+        ),
         'ordered_uom_id': fields.function(
             _get_move_info,
             method=True,
 
=== modified file 'bin/addons/msf_outgoing/wizard/return_ppl_processor_view.xml'
--- bin/addons/msf_outgoing/wizard/return_ppl_processor_view.xml	2016-03-17 08:37:36 +0000
+++ bin/addons/msf_outgoing/wizard/return_ppl_processor_view.xml	2016-11-09 08:29:21 +0000
@@ -47,6 +47,7 @@
                            string="Product"
                            readonly="1"
                            />
+                    <field name="comment" readonly="1" />
                     <field name="asset_id" readonly="1" />
                     <field name="composition_list_id" readonly="1" />
                     <field name="ordered_quantity" readonly="1" />
 
=== modified file 'bin/addons/msf_outgoing/wizard/validate_picking_processor.py'
--- bin/addons/msf_outgoing/wizard/validate_picking_processor.py	2016-03-08 15:48:47 +0000
+++ bin/addons/msf_outgoing/wizard/validate_picking_processor.py	2016-11-09 08:29:21 +0000
@@ -197,6 +197,18 @@
             help="Expected product to receive",
             multi='move_info',
         ),
+        'comment': fields.function(
+            _get_move_info,
+            method=True,
+            string='Comment',
+            type='text',
+            store={
+                'validate.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['move_id'], 20),
+            },
+            readonly=True,
+            help="Comment of the move",
+            multi='move_info',
+        ),
         'ordered_uom_id': fields.function(
             _get_move_info,
             method=True,
 
=== modified file 'bin/addons/msf_outgoing/wizard/validate_picking_processor_view.xml'
--- bin/addons/msf_outgoing/wizard/validate_picking_processor_view.xml	2016-03-17 08:37:36 +0000
+++ bin/addons/msf_outgoing/wizard/validate_picking_processor_view.xml	2016-11-09 08:29:21 +0000
@@ -52,6 +52,7 @@
                             string="Change Product"
                             attrs="{'invisible': [('type_check', '!=', 'in')]}"
                             />
+                    <field name="comment" readonly="1" />
                     <field name="asset_id"
                            domain="[('product_id', '=', product_id)]"
                            attrs="{'readonly': [('asset_check', '=', False)], 'required': [('location_supplier_customer_mem_out', '=', True), ('asset_check', '=', True)]}"
 
=== modified file 'bin/addons/msf_printed_documents/report/report_reception.rml'
--- bin/addons/msf_printed_documents/report/report_reception.rml	2016-03-22 08:24:13 +0000
+++ bin/addons/msf_printed_documents/report/report_reception.rml	2016-11-09 08:29:21 +0000
@@ -575,7 +575,7 @@
                                     </tr>
                                     <tr>
                                         <td>
-                                            <para style="TextInformationN" alignment="LEFT">-</para>
+                                            <para style="TextInformation" alignment="LEFT">[[ line.comment or '-' ]]</para>
                                         </td>
                                         <td>
                                             <para style="TextInformationN" alignment="LEFT">-</para>
 
=== 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-11-09 08:29:21 +0000
@@ -18099,6 +18099,7 @@
 #: report:addons/msf_supply_doc_export/report/report_purchase_order_xls.mako:77
 #: report:addons/msf_supply_doc_export/report/report_request_for_quotation_xls.mako:76
 #: report:addons/msf_supply_doc_export/report/report_sale_order_xls.mako:77
+#: report:addons/msf_supply_doc_export/report/report_internal_move_xls.mako:70
 #: field:purchase.order.line,comment:0
 #: field:purchase.order.merged.line,comment:0
 #: field:sale.order.line,comment:0
@@ -74689,3 +74690,14 @@
 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: msf_instance
+#: code:addons/msf_instance/analytic.py:45
+#, python-format
+msgid "Domain %s not suported"
+msgstr "Domaine %s non supporté"
+
+#. module: msf_instance
+#: code:addons/msf_instance/analytic.py:48
+#, python-format
+msgid "Operator '%s' not suported"
+msgstr "Opérateur '%s' non supporté"
 
=== modified file 'bin/addons/msf_supply_doc_export/report/report_internal_move_xls.mako'
--- bin/addons/msf_supply_doc_export/report/report_internal_move_xls.mako	2013-06-26 09:00:06 +0000
+++ bin/addons/msf_supply_doc_export/report/report_internal_move_xls.mako	2016-11-09 08:29:21 +0000
@@ -67,6 +67,7 @@
     <Row>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Product Code')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Product Description')}</Data></Cell>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Comment')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Quantity')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('UoM')}</Data></Cell>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Kit')}</Data></Cell>
@@ -80,6 +81,7 @@
     <Row>
         <Cell ss:StyleID="line" ><Data ss:Type="String">${(move.product_id.default_code or '')|x}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="String">${(move.product_id.name or '')|x}</Data></Cell>
+        <Cell ss:StyleID="line" ><Data ss:Type="String">${(move.comment or '')|x}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="Number">${(move.product_qty or '')|x}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="String">${(move.product_uom.name or '')|x}</Data></Cell>
         <Cell ss:StyleID="line" ><Data ss:Type="String">${(move.composition_list_id.composition_reference or '')|x}</Data></Cell>
 
=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2016-10-25 08:35:46 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2016-11-09 08:29:21 +0000
@@ -10,9 +10,9 @@
 fo_updates_po_ref,TRUE,TRUE,"['name','state','client_order_ref']","['&','&','&',('partner_type','!=','external'),('client_order_ref','!=',False),('split_type_sale_order','=','original_sale_order'),'!',('client_order_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,purchase.order.update_fo_ref,sale.order,FO updates PO ref,9,Valid
 update_in_ref,TRUE,TRUE,"['name','shipment_ref']","['&',('shipment_ref','!=',False),'!',('shipment_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,stock.picking.update_in_ref,stock.picking,IN updates ref to OUT SHIP,10,Valid
 canceled_fo_cancels_po,TRUE,TRUE,"['name','state', 'client_order_ref']","[('state', '=', 'cancel'), ('client_order_ref', '!=', '')]",partner_id,MISSION,purchase.order.canceled_fo_cancel_po,sale.order,Canceled FO cancels PO,18,Valid
-partial_shipped_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/usage']","['&','&','&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['standard', 'packing']), ('state', '=', 'done'), ('already_shipped', '=', True), ('do_not_sync', '=', False), ('claim', '=', False)]",partner_id,MISSION,stock.picking.partial_shipped_fo_updates_in_po,stock.picking,Partial shipped at Coordo updates IN at Project,19,Valid
-moves_from_dpo_closed_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'subtype', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/dpo_line_id']","['&', '&', '&', ('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['picking', 'standard']), ('dpo_out', '=', True)]",partner_id,MISSION,stock.picking.partial_shippped_dpo_updates_in_po,stock.picking,Moves from DPO closed at Coordo updates IN at Project,20,Valid
-dpo_service_lines_update_in_at_project,FALSE,TRUE,"['order_id/name', 'order_id/delivery_confirmed_date', 'fake_id', 'origin', 'confirmed_delivery_date', 'name', 'product_uom/id', 'product_uom/name', 'link_sol_id/line_number', 'notes', 'product_qty', 'product_id/name', 'product_id/id']","[('dest_partner_id.partner_type', '=', 'internal'), ('order_id.order_type', '=', 'direct'), ('order_id.state', 'in', ['approved', 'done']), ('product_id.type', 'in', ['service', 'service_recep'])]",dest_partner_id,MISSION,purchase.order.line.confirmed_dpo_service_lines_update_in_po,purchase.order.line,DPO service lines update IN at Project,21,Valid
+partial_shipped_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/usage', 'move_lines/comment']","['&','&','&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['standard', 'packing']), ('state', '=', 'done'), ('already_shipped', '=', True), ('do_not_sync', '=', False), ('claim', '=', False)]",partner_id,MISSION,stock.picking.partial_shipped_fo_updates_in_po,stock.picking,Partial shipped at Coordo updates IN at Project,19,Valid
+moves_from_dpo_closed_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'subtype', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/dpo_line_id', 'move_lines/comment']","['&', '&', '&', ('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['picking', 'standard']), ('dpo_out', '=', True)]",partner_id,MISSION,stock.picking.partial_shippped_dpo_updates_in_po,stock.picking,Moves from DPO closed at Coordo updates IN at Project,20,Valid
+dpo_service_lines_update_in_at_project,FALSE,TRUE,"['order_id/name', 'order_id/delivery_confirmed_date', 'fake_id', 'origin', 'confirmed_delivery_date', 'name', 'product_uom/id', 'product_uom/name', 'link_sol_id/line_number', 'notes', 'product_qty', 'product_id/name', 'product_id/id', 'comment']","[('dest_partner_id.partner_type', '=', 'internal'), ('order_id.order_type', '=', 'direct'), ('order_id.state', 'in', ['approved', 'done']), ('product_id.type', 'in', ['service', 'service_recep'])]",dest_partner_id,MISSION,purchase.order.line.confirmed_dpo_service_lines_update_in_po,purchase.order.line,DPO service lines update IN at Project,21,Valid
 cancel_out_at_coordo_cancels_in_at_project,TRUE,TRUE,"['name', 'state', 'origin']","['&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'),('state', '=', 'cancel'),('subtype', '=', 'standard'),('do_not_sync', '=', False)]",partner_id,MISSION,stock.picking.cancel_out_pick_cancel_in,stock.picking,Canceled OUT at Coordo cancels IN at Project,22,Valid
 cancel_pick_at_coordo_cancels_in_at_project,TRUE,TRUE,"['name', 'state', 'origin']","['&','&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'),('state', '=', 'cancel'),('subtype', '=', 'picking'),('backorder_id', '=', False),('do_not_sync', '=', False)]",partner_id,MISSION,stock.picking.cancel_out_pick_cancel_in,stock.picking,Canceled PICK at Coordo cancels IN at Project,23,Valid
 cancel_stock_move_at_coordo_cancels_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'date_cancel']","['&','&','&','&','&','&',('picking_id.partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'),('state', '=', 'cancel'),('picking_id.state', '=', 'done'),('picking_id.do_not_sync', '=', False),('to_be_sent', '=', True), '&', '|', ('picking_id.subtype', '=', 'picking'), ('picking_id.subtype', '=', 'standard'), ('picking_id.already_shipped', '=', False)]",partner_id,MISSION,stock.picking.cancel_stock_move_of_pick_cancel_in,stock.move,Canceled stock move cancels IN,24,Valid
 
=== modified file 'bin/addons/purchase_compare_rfq/wizard/compare_rfq.py'
--- bin/addons/purchase_compare_rfq/wizard/compare_rfq.py	2016-07-21 10:12:49 +0000
+++ bin/addons/purchase_compare_rfq/wizard/compare_rfq.py	2016-11-09 08:29:21 +0000
@@ -343,6 +343,7 @@
                 pol_id = wl_brw.rfq_line_id and wl_brw.rfq_line_id.id or False
                 tl_obj.write(cr, uid, [wl_brw.tender_line_id.id], {
                     'purchase_order_line_id': pol_id,
+                    'comment': wl_brw.rfq_line_id.comment or '',
                 }, context=context)
 
             # UF-733: if all tender lines have been compared (have PO Line id),
 
=== modified file 'bin/addons/purchase_override/purchase.py'
--- bin/addons/purchase_override/purchase.py	2016-10-26 07:22:24 +0000
+++ bin/addons/purchase_override/purchase.py	2016-11-09 08:29:21 +0000
@@ -2148,7 +2148,7 @@
             pick_obj = self.pool.get('stock.picking')
             if pick_obj.search_exist(cr, uid, [('purchase_id', 'in', [order.id])], context=context):
                 return
-
+                
             picking_id = self.pool.get('stock.picking').create(cr, uid, picking_values, context=context)
             todo_moves = []
             for order_line in order.order_line:
@@ -2196,6 +2196,7 @@
                     'date': order_line.confirmed_delivery_date,
                     'date_expected': order_line.confirmed_delivery_date,
                     'line_number': order_line.line_number,
+                    'comment': order_line.comment,
                 }
 
                 if reason_type_id:
@@ -3066,7 +3067,7 @@
 
         # utp-518:we write the comment from the sale.order.line on the PO line through the procurement (only for the create!!)
         po_procurement_id = vals.get('procurement_id', False)
-        if po_procurement_id:
+        if po_procurement_id and not vals.get('comment'):
             sale_id = sol_obj.search(cr, uid, [('procurement_id', '=', po_procurement_id)], context=context)
             if sale_id:
                 comment_so = sol_obj.read(cr, uid, sale_id, ['comment'], context=context)[0]['comment']
 
=== modified file 'bin/addons/sale_override/sale.py'
--- bin/addons/sale_override/sale.py	2016-08-22 13:55:25 +0000
+++ bin/addons/sale_override/sale.py	2016-11-09 08:29:21 +0000
@@ -1911,6 +1911,7 @@
             'price_currency_id': order.procurement_request and order.functional_currency_id.id or order.pricelist_id.currency_id.id,
             'price_unit': order.procurement_request and line.cost_price or line.price_unit,
             'line_number': line.line_number,
+            'comment': line.comment,
         }
 
         if line.order_id.procurement_request and line.order_id.location_requestor_id.usage == 'customer' and not line.product_id and line.comment:
 
=== modified file 'bin/addons/sourcing/procurement_order.py'
--- bin/addons/sourcing/procurement_order.py	2016-08-22 13:55:25 +0000
+++ bin/addons/sourcing/procurement_order.py	2016-11-09 08:29:21 +0000
@@ -124,6 +124,9 @@
             if procurement.po_cft in ('cft', 'rfq') and procurement.price_unit:
                 line.update({'price_unit': procurement.price_unit})
 
+            if procurement.tender_line_id and procurement.tender_line_id.comment:
+                line['comment'] = procurement.tender_line_id
+
         if not line.get('price_unit', False):
             cur_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
             if 'pricelist' in kwargs:
 
=== modified file 'bin/addons/stock_override/report/delivery_order.rml'
--- bin/addons/stock_override/report/delivery_order.rml	2016-07-28 12:21:46 +0000
+++ bin/addons/stock_override/report/delivery_order.rml	2016-11-09 08:29:21 +0000
@@ -177,7 +177,7 @@
 
 
         <section>
-        <blockTable colWidths="25.0,70.0,120.0,60.0,45.0,40.0,70.0,70.0,70.0,80.0,80.0,80.0" style="LineHeader" repeatRows="1">
+        <blockTable colWidths="20.0,70.0,120.0,50.0,60.0,45.0,40.0,70.0,70.0,70.0,65.0,65.0,65.0" style="LineHeader" repeatRows="1">
             <tr>
                 <td>
                     <para style="LHeader">Line</para>
@@ -189,6 +189,9 @@
                     <para style="LHeader">Product Name</para>
                 </td>
                 <td>
+                    <para style="LHeader">CommentS</para>
+                </td>
+                <td>
                     <para style="LHeader">Kit</para>
                 </td>
                 <td>
@@ -229,6 +232,9 @@
                     <para style="Line">[[ line.product_id.name ]]</para>
                 </td>
                 <td>
+                    <para style="Line">[[ line.comment ]]</para>
+                </td>
+                <td>
                     <para style="Line">[[ line.composition_list_id.name ]]</para>
                 </td>
                 <td>
@@ -253,7 +259,7 @@
                     <para style="Line">[[ line.location_dest_id.name ]]</para>
                 </td>
                 <td>
-                    <para style="Line">[[ formatLang(line.date, date_time=True) ]]</para>
+                    <para style="Line">[[ formatLang(line.date[:10], date=True) ]]</para>
                 </td>
             </tr>
         </blockTable>
 
=== modified file 'bin/addons/stock_override/report/internal_move.rml'
--- bin/addons/stock_override/report/internal_move.rml	2015-03-02 17:03:58 +0000
+++ bin/addons/stock_override/report/internal_move.rml	2016-11-09 08:29:21 +0000
@@ -180,7 +180,7 @@
         <setNextTemplate name="second" />
 
         <section>
-        <blockTable colWidths="25.0,70.0,120.0,60.0,45.0,40.0,70.0,70.0,70.0,80.0,80.0,80.0" style="LineHeader" repeatRows="1">
+        <blockTable colWidths="20.0,70.0,120.0,50.0,60.0,45.0,40.0,70.0,70.0,70.0,65.0,65.0,65.0" style="LineHeader" repeatRows="1">
             <tr>
                 <td>
                     <para style="LHeader">Line</para>
@@ -192,6 +192,9 @@
                     <para style="LHeader">Product Name</para>
                 </td>
                 <td>
+                    <para style="LHeader">Comment</para>
+                </td>
+                <td>
                     <para style="LHeader">Kit</para>
                 </td>
                 <td>
@@ -231,6 +234,9 @@
                     <para style="Line">[[ line.product_id.name ]]</para>
                 </td>
                 <td>
+                    <para style="Line">[[ line.comment ]]</para>
+                </td>
+                <td>
                     <para style="Line">[[ line.composition_list_id.name ]]</para>
                 </td>
                 <td>
@@ -255,7 +261,7 @@
                     <para style="Line">[[ line.location_dest_id.name ]]</para>
                 </td>
                 <td>
-                    <para style="Line">[[ formatLang(line.date, date_time=True) ]]</para>
+                    <para style="Line">[[ formatLang(line.date[:10], date=True) ]]</para>
                 </td>
             </tr>
         </blockTable>
 
=== 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-11-09 08:29:21 +0000
@@ -335,6 +335,7 @@
                                 <tree colors="grey:scrapped == True; red: inactive_product or to_correct_ok or expired_lot" string="Stock Moves" noteditable="fake_state=='assigned'" hide_new_button="context.get('from_wkf')" hide_delete_button="context.get('from_wkf')">
                                     <field name="line_number"/>
                                     <field name="product_id" />
+                                    <field name="comment" />
                                     <field name="composition_list_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" string="UoM"/>
@@ -405,6 +406,7 @@
                                             invisible="1"
                                             />
                                         <field name="product_packaging" domain="[('product_id','=',product_id)]" colspan="4" invisible="1"/>
+                                        <field name="comment" colspan="4" />
                                     </group>
 
                                     <group colspan="2" col="2">
@@ -594,6 +596,7 @@
                                     <field name="line_number"/>
                                     <field name="product_id" context="{'available_for_restriction': 'consumption', 'search_default_not_restricted': 1}" />
                                     <field name="inactive_product" invisible="1" />
+                                    <field name="comment" />
                                     <field name="product_qty"/>
                                     <field name="product_uom" string="UoM"/>
                                     <field name="scrapped" invisible="1"/>
@@ -644,6 +647,7 @@
                                         	attrs="{'readonly': [('from_wkf_line', '=', True)]}"
                                         	colspan="2"
                                         	domain="[('uom_by_product', '=', product_id)]"/>
+                                        <field name="comment" colspan="4" />
                                         <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4" invisible="1"/>
                                         <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4" invisible="1"/>
                                         <field name="product_packaging" domain="[('product_id','=',product_id)]" colspan="4" invisible="1" />
@@ -879,6 +883,7 @@
                                 <tree colors="grey:scrapped==True; red: inactive_product == True or product_tbd == True" string="Stock Moves" noteditable="fake_state in ('assigned', 'cancel')" hide_new_button="context.get('from_wkf')" hide_delete_button="True">
                                     <field name="line_number"/>
                                     <field name="product_id" context="{'available_for_restriction': 'picking', 'search_default_not_restricted': 1}"/>
+                                    <field name="comment" />
                                     <field name="composition_list_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" string="UoM"/>
 
=== modified file 'bin/addons/sync_so/picking.py'
--- bin/addons/sync_so/picking.py	2016-08-23 12:54:03 +0000
+++ bin/addons/sync_so/picking.py	2016-11-09 08:29:21 +0000
@@ -201,6 +201,7 @@
                   'name': data['name'],
                   'quantity': data['product_qty'] or 0.0,
                   'note': data['note'],
+                  'comment': data.get('comment'),
                   }
         return result
 
@@ -337,6 +338,7 @@
                     ln = data.get('line_number')
                     # UF-2148: if the line contains 0 qty, just ignore it!
                     qty = data.get('quantity', 0)
+                    comment = data.get('comment', False)
                     if qty == 0:
                         message = "Line number " + str(ln) + " with quantity 0 is ignored!"
                         self._logger.info(message)
@@ -453,10 +455,16 @@
                                (line.prodlot_id and line.prodlot_id.id == data.get('prodlot_id')) or (not line.prodlot_id and not data.get('prodlot_id')) and \
                                (line.asset_id and line.asset_id.id == data.get('asset_id')) or (not line.asset_id and not data.get('asset_id')):
                                 move_proc.write(cr, uid, [line.id], data, context=context)
+                                if data.get('comment'):
+                                    move_proc.write(cr, uid, line.id, {
+                                        'comment': data['comment']
+                                        }, context=context)
                                 break
                         else:
                             data['ordered_quantity'] = data['quantity']
-                            move_proc.create(cr, uid, data, context=context)
+                            move_proc_id = move_proc.create(cr, uid, data, context=context)
+                            if data.get('comment'):
+                                move_proc.write(cr, uid, move_proc_id, {'comment': data['comment']}, context=context)
                     #US-1294: Add this move and quantity as already shipped, since it's added to the wizard for processing
                     self._add_to_shipped_moves(already_shipped_moves, move_id, data['quantity'])
 
 
=== modified file 'bin/addons/sync_so/purchase.py'
--- bin/addons/sync_so/purchase.py	2016-10-24 15:41:52 +0000
+++ bin/addons/sync_so/purchase.py	2016-11-09 08:29:21 +0000
@@ -74,6 +74,7 @@
                 'date': line_dict.get('confirmed_delivery_date', time.strftime('%Y-%m-%d %H:%M:%S')),
                 'change_reason': False,
                 'product_id': line_dict.get('product_id'),
+                'comment': line_dict.get('comment'),
             }],
         }
 
 
=== modified file 'bin/addons/tender_flow/tender_flow.py'
--- bin/addons/tender_flow/tender_flow.py	2016-08-18 08:32:03 +0000
+++ bin/addons/tender_flow/tender_flow.py	2016-11-09 08:29:21 +0000
@@ -375,6 +375,7 @@
                               'notes': line.product_id.description_purchase,
                               'order_id': po_id,
                               'tender_line_id': line.id,
+                              'comment': line.comment,
                               }
                     # create purchase order line
                     pol_id = pol_obj.create(cr, uid, values, context=context)
@@ -651,6 +652,7 @@
                                                                'date_planned': line.date_planned,
                                                                'move_dest_id': False,
                                                                'notes': line.product_id.description_purchase,
+                                                               'comment': line.comment,
                                                                }))
                     
                 # fill data corresponding to po creation