Merge lp:~openerp-dev/openobject-addons/6.1-bug-1084412-dhs into lp:openobject-addons/6.1

Proposed by Dhruti Shastri(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-bug-1084412-dhs
Merge into: lp:openobject-addons/6.1
Diff against target: 20 lines (+8/-2)
1 file modified
sale/sale.py (+8/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-bug-1084412-dhs
Reviewer Review Type Date Requested Status
Naresh(OpenERP) Pending
Review via email: mp+138090@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

7092. By Dhruti Shastri(OpenERP)

[FIX][sale] : product_qty on invoice takes the quantities from pickings canceled

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sale/sale.py'
2--- sale/sale.py 2012-10-09 12:16:14 +0000
3+++ sale/sale.py 2012-12-05 10:41:27 +0000
4@@ -1019,8 +1019,14 @@
5 return line.product_uos_qty or 0.0
6 return line.product_uom_qty
7 else:
8- return self.pool.get('procurement.order').quantity_get(cr, uid,
9- line.procurement_id.id, context=context)
10+ cancel_moves = 0.0
11+ for moves in line.move_ids:
12+ if moves.state == 'cancel':
13+ cancel_moves += moves.product_qty
14+ return line.product_uom_qty - cancel_moves
15+
16+ return self.pool.get('procurement.order').quantity_get(cr, uid,
17+ line.procurement_id.id, context=context)
18
19 def _get_line_uom(line):
20 if (line.order_id.invoice_quantity=='order') or not line.procurement_id: