diff --git a/addons/stock/report/lot_location.rml b/addons/stock/report/lot_location.rml index ef7be095740..001804e75ae 100644 --- a/addons/stock/report/lot_location.rml +++ b/addons/stock/report/lot_location.rml @@ -13,7 +13,6 @@ - diff --git a/addons/stock/report/lot_overview.rml b/addons/stock/report/lot_overview.rml index 6820d1c497a..f62da3ef0d8 100644 --- a/addons/stock/report/lot_overview.rml +++ b/addons/stock/report/lot_overview.rml @@ -83,7 +83,6 @@ [[ repeatIn(objects,'o') ]]
[[ repeatIn(process(o.id),'ob') ]] - [[ ob['location_name'] ]] diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml index 2f1f30564d6..e848ba89f6a 100644 --- a/addons/stock/report/lot_overview_all.rml +++ b/addons/stock/report/lot_overview_all.rml @@ -20,6 +20,7 @@ + @@ -31,14 +32,23 @@ - + - - - + + + + + + + + + + + + @@ -47,10 +57,11 @@ - + - + + @@ -73,100 +84,73 @@
- + - - Code - - - Product - - - Variants - - - Amount - - - UoM - - - Unit Price - - - Value - + Location + Code + Product + Variants + Amount + UoM + UnitPrice + Value - [[repeatIn(objects,'o')]] + [[repeatIn(objects,'o')]]
[[ repeatIn(process(o.id),'ob') ]] - Location :[[ ob['location_name'] ]] - + + + [[ ob['location_name'] ]] + + [[ ob['product'] or 'No products in this Location' ]] + + + + + + - - [[ repeatIn(ob['product'],'p') ]] - - - [[ p['code'] ]] - - - [[ p['prod_name'] ]] - - - [[ p['variants'] ]] - - - [[ p['prod_qty'] ]] - - - [[ p['uom'] ]] - - - [[ p['price'] ]] - - - [[ p['price_value'] ]] - + [[ repeatIn(ob['product'],'p') ]] + [[ p['code'] ]] + [[ p['prod_name'] ]] + [[ p['variants'] ]] + [[ p['prod_qty'] ]] + [[ p['uom'] ]] + [[ p['price'] ]] + [[ p['price_value'] ]] - - - - - - - - - Total: - - - [[ price_total() ]] - + + + + Total: + + + + + + [[ price_total() ]] - - - + +
- + - - - - - - - Grand Total: - - - [[ grand_total_price() ]] - + Grand Total: + + + + + + + [[ grand_total_price() ]] - +