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
42
        Return the shipped rate of a PO line
42
        Return the shipped rate of a PO line
6
43
        '''
43
        '''
7
44
        uom_obj = self.pool.get('product.uom')
44
        uom_obj = self.pool.get('product.uom')
9
45
        line_value = line.price_subtotal
45
        line_value = line.product_qty
10
46
        move_value = 0.00
46
        move_value = 0.00
11
47
        for move in line.move_ids:
47
        for move in line.move_ids:
12
48
            if move.state == 'done':
48
            if move.state == 'done':
13
49
                product_qty = uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, line.product_uom.id)
49
                product_qty = uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, line.product_uom.id)
14
50
                if move.type == 'out':
50
                if move.type == 'out':
16
51
                    move_value -= product_qty*move.price_unit
51
                    move_value -= product_qty
17
52
                elif move.type == 'in':
52
                elif move.type == 'in':
19
53
                    move_value += product_qty*move.price_unit
53
                    move_value += product_qty
20
54
54
21
55
        return round((move_value/line_value)*100, 2)
55
        return round((move_value/line_value)*100, 2)
22
56
56
23
57
57
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
44
            amount_total = 0.00
44
            amount_total = 0.00
29
45
            amount_received = 0.00
45
            amount_received = 0.00
30
46
            for line in order.order_line:
46
            for line in order.order_line:
32
47
                amount_total += line.product_qty*line.price_unit
47
                amount_total += line.product_qty
33
48
                for move in line.move_ids:
48
                for move in line.move_ids:
34
49
                    if move.state == 'done':
49
                    if move.state == 'done':
35
50
                        move_qty = uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, line.product_uom.id)
50
                        move_qty = uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, line.product_uom.id)
36
51
                        if move.type == 'out':
51
                        if move.type == 'out':
38
52
                            amount_received -= move_qty*line.price_unit
52
                            amount_received -= move_qty
39
53
                        elif move.type == 'in':
53
                        elif move.type == 'in':
41
54
                            amount_received += move_qty*line.price_unit
54
                            amount_received += move_qty
42
55
                        elif move.type == 'internal':
55
                        elif move.type == 'internal':
43
56
                            # not taken into account
56
                            # not taken into account
44
57
                            pass
57
                            pass
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
UniField Reviewer Team		2016-07-21	Pending
Review via email: mp+300726@code.launchpad.net
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	42	Return the shipped rate of a PO line	42	Return the shipped rate of a PO line
6	43	'''	43	'''
7	44	uom_obj = self.pool.get('product.uom')	44	uom_obj = self.pool.get('product.uom')
9	45	line_value = line.price_subtotal	45	line_value = line.product_qty
10	46	move_value = 0.00	46	move_value = 0.00
11	47	for move in line.move_ids:	47	for move in line.move_ids:
12	48	if move.state == 'done':	48	if move.state == 'done':
13	49	product_qty = uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, line.product_uom.id)	49	product_qty = uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, line.product_uom.id)
14	50	if move.type == 'out':	50	if move.type == 'out':
16	51	move_value -= product_qty*move.price_unit	51	move_value -= product_qty
17	52	elif move.type == 'in':	52	elif move.type == 'in':
19	53	move_value += product_qty*move.price_unit	53	move_value += product_qty
20	54		54
21	55	return round((move_value/line_value)*100, 2)	55	return round((move_value/line_value)*100, 2)
22	56		56
23	57		57
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	44	amount_total = 0.00	44	amount_total = 0.00
29	45	amount_received = 0.00	45	amount_received = 0.00
30	46	for line in order.order_line:	46	for line in order.order_line:
32	47	amount_total += line.product_qty*line.price_unit	47	amount_total += line.product_qty
33	48	for move in line.move_ids:	48	for move in line.move_ids:
34	49	if move.state == 'done':	49	if move.state == 'done':
35	50	move_qty = uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, line.product_uom.id)	50	move_qty = uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, line.product_uom.id)
36	51	if move.type == 'out':	51	if move.type == 'out':
38	52	amount_received -= move_qty*line.price_unit	52	amount_received -= move_qty
39	53	elif move.type == 'in':	53	elif move.type == 'in':
41	54	amount_received += move_qty*line.price_unit	54	amount_received += move_qty
42	55	elif move.type == 'internal':	55	elif move.type == 'internal':
43	56	# not taken into account	56	# not taken into account
44	57	pass	57	pass