Unifield Server

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

  1. us-1110
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3893
Proposed branch: lp:~unifield-team/unifield-server/us-1110
Merge into: lp:unifield-server
Diff against target: 44 lines (+6/-6)
2 files modified
bin/addons/purchase_followup/purchase_followup.py (+3/-3)
bin/addons/purchase_followup/sale_purchase.py (+3/-3)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1110
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+300726@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/purchase_followup/purchase_followup.py'
2--- bin/addons/purchase_followup/purchase_followup.py 2014-05-14 14:04:42 +0000
3+++ bin/addons/purchase_followup/purchase_followup.py 2016-07-21 08:32:14 +0000
4@@ -42,15 +42,15 @@
5 Return the shipped rate of a PO line
6 '''
7 uom_obj = self.pool.get('product.uom')
8- line_value = line.price_subtotal
9+ line_value = line.product_qty
10 move_value = 0.00
11 for move in line.move_ids:
12 if move.state == 'done':
13 product_qty = uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, line.product_uom.id)
14 if move.type == 'out':
15- move_value -= product_qty*move.price_unit
16+ move_value -= product_qty
17 elif move.type == 'in':
18- move_value += product_qty*move.price_unit
19+ move_value += product_qty
20
21 return round((move_value/line_value)*100, 2)
22
23
24=== modified file 'bin/addons/purchase_followup/sale_purchase.py'
25--- bin/addons/purchase_followup/sale_purchase.py 2014-03-14 10:29:03 +0000
26+++ bin/addons/purchase_followup/sale_purchase.py 2016-07-21 08:32:14 +0000
27@@ -44,14 +44,14 @@
28 amount_total = 0.00
29 amount_received = 0.00
30 for line in order.order_line:
31- amount_total += line.product_qty*line.price_unit
32+ amount_total += line.product_qty
33 for move in line.move_ids:
34 if move.state == 'done':
35 move_qty = uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, line.product_uom.id)
36 if move.type == 'out':
37- amount_received -= move_qty*line.price_unit
38+ amount_received -= move_qty
39 elif move.type == 'in':
40- amount_received += move_qty*line.price_unit
41+ amount_received += move_qty
42 elif move.type == 'internal':
43 # not taken into account
44 pass

Subscribers

People subscribed via source and target branches

to all changes: