Merge lp:~openerp-dev/openobject-addons/trunk-bug-1012382-nco into lp:openobject-addons

[Nimesh Contractor(Open ERP)]

Hello,

Problem on Moves Analysis report when stock move has same product and same product qty on picking and when we are going to group by "Shipment" then its shows the wrong no lines and quantity.

i.e: create one picking for 3 same lines of product USB Adaptor with 10 qty each.
Group by : shipment shows the IN/0001(1) 10 instead of IN/0001(3) 30

Thank You!

[Amit Parik (amit-parik)]

Hello,

Tested works fine!

Thanks!

review: Approve

Unmerged revisions

8708. By Egor Tsinko on 2013-05-17

[FIX] group by shipment with same product and same quantiy lines.

=== modified file 'stock/report/report_stock_move.py'
--- stock/report/report_stock_move.py	2013-04-15 10:23:49 +0000
+++ stock/report/report_stock_move.py	2013-05-17 12:34:45 +0000
@@ -85,6 +85,7 @@
                         al.stock_journal as stock_journal,
                         sum(al.in_value - al.out_value) as value
                     FROM (SELECT
+                        sm.id as id,
                         CASE WHEN sp.type in ('out') THEN
                             sum(sm.product_qty * pu.factor / pu2.factor)
                             ELSE 0.0
@@ -135,6 +136,7 @@
                         sm.company_id,sm.product_qty, sm.location_id,sm.location_dest_id,pu.factor,pt.categ_id, sp.stock_journal_id)
                     AS al
                     GROUP BY
+                        al.id,
                         al.out_qty,al.in_qty,al.curr_year,al.curr_month,
                         al.curr_day,al.curr_day_diff,al.curr_day_diff1,al.curr_day_diff2,al.dp,al.location_id,al.location_dest_id,
                         al.partner_id,al.product_id,al.state,al.product_uom,