From b830e763cc4539e1e64dde29add5d74bef0c26a0 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Wed, 1 Sep 2010 19:49:37 +0530 Subject: [PATCH] [IMP]:stock:Location Content bzr revid: apa@tinyerp.com-20100901141937-89hjh7k3o0jmpx73 --- addons/stock/report/lot_overview_all.rml | 202 ++++++++++++----------- 1 file changed, 103 insertions(+), 99 deletions(-) diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml index c21ccb5e3eb..5fb67ca24c1 100644 --- a/addons/stock/report/lot_overview_all.rml +++ b/addons/stock/report/lot_overview_all.rml @@ -10,7 +10,7 @@ - + @@ -19,27 +19,26 @@ - + + - + - - - - - + + + + + - + - - @@ -87,62 +86,96 @@ + + + Location Content - [[ repeatIn(objects,'o') ]] + + + + + + + Location / Product + + + Variants + + + Quantity + + + Unit Price + + + Value([[ company.currency_id.name ]]) + + +
- [[ repeatIn(process(o.id),'ob') ]] - - - - Location / Product - - - Variants - - - Quantity - - - Unit Price - - - Value([[ o.company_id.currency_id.name ]]) - - - - - - - [[ ob['location_name'] ]] - - - - - - - - - - - - - - - - - - - - - - - - - - + [[ repeatIn(objects,'o') ]]
- [[ repeatIn(ob['product'],'p') ]] - + [[ repeatIn(process(o.id),'ob') ]] + + + + [[ ob['location_name'] ]] + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ [[ repeatIn(ob['product'],'p') ]] + + + + + + + + + [ [[ p['code'] ]] ] [[ p['prod_name'] ]] + + + [[ p['variants'] ]] + + + [[formatLang( p['prod_qty']) ]] [[ p['uom'] ]] + + + [[ formatLang(p['price']) ]] + + + [[ formatLang(p['price_value']) ]] [[ o.company_id.currency_id.symbol]] + + + +
+ @@ -150,51 +183,22 @@ - [ [[ p['code'] ]] ] [[ p['prod_name'] ]] + Total: - [[ p['variants'] ]] - - - [[formatLang( p['prod_qty']) ]] [[ p['uom'] ]] - - - [[ formatLang(p['price']) ]] - - - [[ formatLang(p['price_value'] )]] [[ o.company_id.currency_id.symbol ]] + [[ formatLang(price_total()) ]] [[ o.company_id.currency_id.symbol ]]
- - - - - - - - - Total: - - - - - - - - [[ formatLang(price_total()) ]] [[ o.company_id.currency_id.symbol ]] - - -
- + - Grand Total: + Grand Total: - + @@ -203,7 +207,7 @@ - +