Unifield Server

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

  1. us-1551
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3880
Proposed branch: lp:~unifield-team/unifield-server/us-1551
Merge into: lp:unifield-server
Diff against target: 79 lines (+15/-10)
5 files modified
bin/addons/msf_outgoing/report/empty_picking_ticket.rml (+1/-0)
bin/addons/msf_outgoing/report/picking_ticket.py (+1/-0)
bin/addons/msf_outgoing/report/picking_ticket.rml (+1/-0)
bin/addons/stock_override/report/delivery_order.rml (+2/-1)
bin/addons/sync_so/sale.py (+10/-9)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1551
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+301893@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/msf_outgoing/report/empty_picking_ticket.rml'
2--- bin/addons/msf_outgoing/report/empty_picking_ticket.rml 2016-03-22 08:24:13 +0000
3+++ bin/addons/msf_outgoing/report/empty_picking_ticket.rml 2016-08-03 10:07:03 +0000
4@@ -350,6 +350,7 @@
5 <!-- Lines -->
6 <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">
7 [[ repeatIn(getLines(pt), 'm', 'blockTable') ]]
8+ [[ m.state == 'cancel' and removeParentNode('blockTable') ]]
9 <tr>
10 <td>
11 <para style="LineValue">[[ not m.no_product and m.line_number or '' ]]</para>
12
13=== modified file 'bin/addons/msf_outgoing/report/picking_ticket.py'
14--- bin/addons/msf_outgoing/report/picking_ticket.py 2016-03-08 15:32:40 +0000
15+++ bin/addons/msf_outgoing/report/picking_ticket.py 2016-08-03 10:07:03 +0000
16@@ -35,6 +35,7 @@
17 self.line_number = move.line_number
18 self.sale_line_id = move.sale_line_id
19 self.product_uom = move.product_id.uom_id
20+ self.state = move.state
21 self.product_qty = 0.00
22 self.prodlot_id = None
23 self.kc_check = False
24
25=== modified file 'bin/addons/msf_outgoing/report/picking_ticket.rml'
26--- bin/addons/msf_outgoing/report/picking_ticket.rml 2016-03-22 08:24:13 +0000
27+++ bin/addons/msf_outgoing/report/picking_ticket.rml 2016-08-03 10:07:03 +0000
28@@ -366,6 +366,7 @@
29 <!-- Lines -->
30 <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">
31 [[ repeatIn(getLines(pt), 'm', 'blockTable') ]]
32+ [[ m.state == 'cancel' and removeParentNode('blockTable') ]]
33 <tr>
34 <td>
35 <para style="LineValue">[[ not m.no_product and m.line_number or '' ]]</para>
36
37=== modified file 'bin/addons/stock_override/report/delivery_order.rml'
38--- bin/addons/stock_override/report/delivery_order.rml 2014-11-06 07:49:57 +0000
39+++ bin/addons/stock_override/report/delivery_order.rml 2016-08-03 10:07:03 +0000
40@@ -217,7 +217,8 @@
41 </td>
42 </tr>
43 <tr>
44- [[ repeatIn(picking.move_lines, 'line', 'tr') ]]
45+ [[ repeatIn(picking.move_lines, 'line', 'tr') ]]
46+ [[ line.state == 'cancel' and removeParentNode('tr') ]]
47 <td>
48 <para style="Line">[[ line.line_number ]]</para>
49 </td>
50
51=== modified file 'bin/addons/sync_so/sale.py'
52--- bin/addons/sync_so/sale.py 2016-03-24 16:43:45 +0000
53+++ bin/addons/sync_so/sale.py 2016-08-03 10:07:03 +0000
54@@ -384,15 +384,16 @@
55 orig_partner_name = self.browse(cr, uid, original_id, context=context).partner_id.name
56
57 # Generate messages for cancel lines
58- available_solc_ids = solc_obj.search(cr, uid, eval(solccl_rule.domain),
59- order='NO_ORDER', context=context)
60- for asolc in solc_obj.browse(cr, uid, available_solc_ids, context=context):
61- sol_ids = sol_obj.search(cr, uid, [
62- ('order_id', '=', original_id),
63- ('sync_order_line_db_id', '=', asolc.resource_sync_line_db_id),
64- ], context=context)
65- if sol_ids:
66- generate_msg_to_send(solccl_rule, solccl_model_obj, asolc.id, orig_partner_name)
67+ if solccl_rule:
68+ available_solc_ids = solc_obj.search(cr, uid, eval(solccl_rule.domain),
69+ order='NO_ORDER', context=context)
70+ for asolc in solc_obj.browse(cr, uid, available_solc_ids, context=context):
71+ sol_ids = sol_obj.search(cr, uid, [
72+ ('order_id', '=', original_id),
73+ ('sync_order_line_db_id', '=', asolc.resource_sync_line_db_id),
74+ ], context=context)
75+ if sol_ids:
76+ generate_msg_to_send(solccl_rule, solccl_model_obj, asolc.id, orig_partner_name)
77
78 if nfo_model_obj and nfo_rule:
79 available_nfo_ids = self.search(cr, uid, eval(nfo_rule.domain),

Subscribers

People subscribed via source and target branches

to all changes: