diff --git a/addons/stock/report/lot_location.rml b/addons/stock/report/lot_location.rml index a075637955f..94cc3f51340 100644 --- a/addons/stock/report/lot_location.rml +++ b/addons/stock/report/lot_location.rml @@ -49,6 +49,7 @@ + @@ -60,20 +61,19 @@ - - - Location - Product - Quantity - - - [[ repeatIn(objects,'o') ]] + [[ repeatIn(objects,'o') ]] - [[ repeatIn(process(o.id),'ob') ]] + [[ repeatIn(process(o.id),'ob') ]] + + [[ ob['product'] or removeParentNode('blockTable') ]] Location + Product + Quantity + + [[ ob['location_name'] ]] - [[ ob['product'] or 'No products in this Location !' ]] + @@ -83,27 +83,14 @@ [[ p['prod_qty'] ]] [[ p['uom'] ]] - - Total : [[ ob['total'] ]] Units - - - - - - - - - - - - + diff --git a/addons/stock/report/lot_overview.rml b/addons/stock/report/lot_overview.rml index 65c48fa43c1..ad05b011757 100644 --- a/addons/stock/report/lot_overview.rml +++ b/addons/stock/report/lot_overview.rml @@ -10,11 +10,6 @@ - - - - - @@ -24,18 +19,7 @@ - - - - - - - - - - - - + @@ -57,6 +41,7 @@ + @@ -69,9 +54,12 @@ - + [[ repeatIn(objects,'o') ]] + + [[ repeatIn(process(o.id),'ob') ]] + - Location + [[ ob['product'] or removeParentNode('blockTable') ]] Location Product Variants Quantity @@ -79,14 +67,9 @@ Unit Price Value - - [[ repeatIn(objects,'o') ]] - - [[ repeatIn(process(o.id),'ob') ]] - [[ ob['location_name'] ]] - [[ ob['product'] or 'No products in this Location !' ]] + @@ -94,7 +77,7 @@ - [[ repeatIn(ob['product'],'p') ]] + [[ repeatIn(ob['product'],'p') ]] [[ p['prod_name'] ]] [[ p['variants'] ]] [[ p['prod_qty'] ]] @@ -102,9 +85,7 @@ [[ p['price'] ]] [[ p['price_value'] ]] - - - + Total: @@ -115,9 +96,6 @@ - - - @@ -128,7 +106,7 @@ - [[ grand_total_price() ]] + [[ grand_total_price() ]] diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml index e848ba89f6a..0df08385c9a 100644 --- a/addons/stock/report/lot_overview_all.rml +++ b/addons/stock/report/lot_overview_all.rml @@ -10,45 +10,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -68,6 +39,7 @@ + @@ -80,13 +52,13 @@ - - - - - - Location + [[ repeatIn(objects,'o') ]] + + [[ repeatIn(process(o.id),'ob') ]] + + + [[ ob['product'] or removeParentNode('blockTable') ]] Location Code Product Variants @@ -94,16 +66,11 @@ UoM UnitPrice Value - - - [[repeatIn(objects,'o')]] - - [[ repeatIn(process(o.id),'ob') ]] - + [[ ob['location_name'] ]] - [[ ob['product'] or 'No products in this Location' ]] + @@ -120,36 +87,29 @@ [[ p['price'] ]] [[ p['price_value'] ]] - - - - - - - + + Total: - - - - - + + + + + [[ price_total() ]] - - Grand Total: - - - - - - - [[ grand_total_price() ]] + + + + + + + [[ grand_total_price() ]]