unifield-wm

Merge lp:~unifield-team/unifield-wm/us-705 into lp:unifield-wm

  1. us-705
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 2722
Proposed branch: lp:~unifield-team/unifield-wm/us-705
Merge into: lp:unifield-wm
Diff against target: 26 lines (+4/-3)
1 file modified
sales_followup/report/sale_follow_up_report_multi.py (+4/-3)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/us-705
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+283595@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 'sales_followup/report/sale_follow_up_report_multi.py'
2--- sales_followup/report/sale_follow_up_report_multi.py 2015-06-16 08:08:25 +0000
3+++ sales_followup/report/sale_follow_up_report_multi.py 2016-01-22 10:37:46 +0000
4@@ -91,7 +91,7 @@
5 for move in line.move_ids:
6 m_type = move.product_qty != 0.00 and move.picking_id.type == 'out'
7 ppl = move.picking_id.subtype == 'packing' and move.picking_id.shipment_id and move.location_dest_id.usage == 'customer'
8- s_out = move.subtype == 'standard' and move.state == 'done' and move.location_dest_id.usage == 'customer'
9+ s_out = move.picking_id.subtype == 'standard' and move.state == 'done' and move.location_dest_id.usage == 'customer'
10
11 if m_type and (ppl or s_out):
12 data = {}
13@@ -130,10 +130,11 @@
14 else:
15 key = (packing, False, move.product_uom.name, line.line_number)
16 data.update({
17- 'packing': packing,
18- 'delivery_qty': move.product_qty,
19+ 'packing': '',
20+ 'delivered_qty': move.product_qty,
21 'delivered_uom': move.product_uom.name,
22 'rts': move.picking_id.min_date[0:10],
23+ 'shipment': packing,
24 })
25
26 bo_qty -= self.pool.get('product.uom')._compute_qty(

Subscribers

People subscribed via source and target branches