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

[jftempo]

=== modified file 'bin/addons/msf_outgoing/report/empty_picking_ticket.rml'
--- bin/addons/msf_outgoing/report/empty_picking_ticket.rml	2016-03-22 08:24:13 +0000
+++ bin/addons/msf_outgoing/report/empty_picking_ticket.rml	2016-08-03 10:07:03 +0000
@@ -350,6 +350,7 @@
             <!-- Lines -->
             <blockTable colWidths="30.0,60.0,220.0,55.0,75.0,65.0,20.0,20.0,20.0,55.0,45.0,45.0,50.0,50.0" rowHeights="15.0" style="LinesValues">
                 [[ repeatIn(getLines(pt), 'm', 'blockTable') ]]
+                [[ m.state == 'cancel' and removeParentNode('blockTable') ]]
                 <tr>
                     <td>
                         <para style="LineValue">[[ not m.no_product and m.line_number or '' ]]</para>
 
=== modified file 'bin/addons/msf_outgoing/report/picking_ticket.py'
--- bin/addons/msf_outgoing/report/picking_ticket.py	2016-03-08 15:32:40 +0000
+++ bin/addons/msf_outgoing/report/picking_ticket.py	2016-08-03 10:07:03 +0000
@@ -35,6 +35,7 @@
         self.line_number = move.line_number
         self.sale_line_id = move.sale_line_id
         self.product_uom = move.product_id.uom_id
+        self.state = move.state
         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-03-22 08:24:13 +0000
+++ bin/addons/msf_outgoing/report/picking_ticket.rml	2016-08-03 10:07:03 +0000
@@ -366,6 +366,7 @@
             <!-- Lines -->
             <blockTable colWidths="30.0,60.0,220.0,80.0,55.0,55.0,55.0,55.0,75.0,65.0,20.0,20.0,20.0" rowHeights="15.0" style="LinesValues">
                 [[ repeatIn(getLines(pt), 'm', 'blockTable') ]]
+                [[ m.state == 'cancel' and removeParentNode('blockTable') ]]
                 <tr>
                     <td>
                         <para style="LineValue">[[ not m.no_product and m.line_number or '' ]]</para>
 
=== modified file 'bin/addons/stock_override/report/delivery_order.rml'
--- bin/addons/stock_override/report/delivery_order.rml	2014-11-06 07:49:57 +0000
+++ bin/addons/stock_override/report/delivery_order.rml	2016-08-03 10:07:03 +0000
@@ -217,7 +217,8 @@
                 </td>
             </tr>
             <tr>
-            [[ repeatIn(picking.move_lines, 'line', 'tr') ]]
+                [[ repeatIn(picking.move_lines, 'line', 'tr') ]]
+                [[  line.state == 'cancel' and removeParentNode('tr') ]]
                 <td>
                     <para style="Line">[[ line.line_number ]]</para>
                 </td>
 
=== modified file 'bin/addons/sync_so/sale.py'
--- bin/addons/sync_so/sale.py	2016-03-24 16:43:45 +0000
+++ bin/addons/sync_so/sale.py	2016-08-03 10:07:03 +0000
@@ -384,15 +384,16 @@
             orig_partner_name = self.browse(cr, uid, original_id, context=context).partner_id.name
 
             # Generate messages for cancel lines
-            available_solc_ids = solc_obj.search(cr, uid, eval(solccl_rule.domain),
-                    order='NO_ORDER', context=context)
-            for asolc in solc_obj.browse(cr, uid, available_solc_ids, context=context):
-                sol_ids = sol_obj.search(cr, uid, [
-                    ('order_id', '=', original_id),
-                    ('sync_order_line_db_id', '=', asolc.resource_sync_line_db_id),
-                ], context=context)
-                if sol_ids:
-                    generate_msg_to_send(solccl_rule, solccl_model_obj, asolc.id, orig_partner_name)
+            if solccl_rule:
+                available_solc_ids = solc_obj.search(cr, uid, eval(solccl_rule.domain),
+                        order='NO_ORDER', context=context)
+                for asolc in solc_obj.browse(cr, uid, available_solc_ids, context=context):
+                    sol_ids = sol_obj.search(cr, uid, [
+                        ('order_id', '=', original_id),
+                        ('sync_order_line_db_id', '=', asolc.resource_sync_line_db_id),
+                    ], context=context)
+                    if sol_ids:
+                        generate_msg_to_send(solccl_rule, solccl_model_obj, asolc.id, orig_partner_name)
 
             if nfo_model_obj and nfo_rule:
                 available_nfo_ids = self.search(cr, uid, eval(nfo_rule.domain),