From 86a1d32b6e777d8efefc98cf7f147df3c0d17964 Mon Sep 17 00:00:00 2001 From: "apa,saz" <> Date: Fri, 3 Sep 2010 18:03:25 +0530 Subject: [PATCH] [IMP]:improved reports bzr revid: apa@tinyerp.com-20100903123325-rfl0juxifkm1l6n7 --- .../account/report/account_general_ledger.rml | 38 ++++----- .../account_general_ledger_landscape.rml | 83 +++++++++---------- addons/stock/report/picking.rml | 33 ++------ 3 files changed, 67 insertions(+), 87 deletions(-) diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml index ac940d13d34..cc0a7826647 100644 --- a/addons/account/report/account_general_ledger.rml +++ b/addons/account/report/account_general_ledger.rml @@ -146,7 +146,7 @@ - + @@ -246,9 +246,9 @@ Ref Move Entry Label - Debit - Crebit - Balance + Debit([[ company.currency_id.code]]) + Crebit([[ company.currency_id.code]]) + Balance([[ company.currency_id.code]])
@@ -260,9 +260,9 @@ [[ o.code or '']] [[ o.name or '']] - [[formatLang(sum_debit_account(o, data['form'])) ]] - [[formatLang(sum_credit_account(o, data['form'])) ]] - [[formatLang(sum_balance_account(o, data['form'])) ]] + [[formatLang(sum_debit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]] + [[formatLang(sum_credit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]] + [[formatLang(sum_balance_account(o, data['form'])) ]] [[ company.currency_id.symbol ]] @@ -280,9 +280,9 @@ [[ line['lref'] or '']] [[ line['move'] or '']] [[ line['lname'] or '' ]] - [[ formatLang(line['debit']) ]] - [[ formatLang(line['credit']) ]] - [[ formatLang(line['progress']) ]] + [[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]
@@ -296,9 +296,9 @@ Ref Move Entry Label - Debit - Crebit - Balance + Debit([[ company.currency_id.code]]) + Credit([[ company.currency_id.code]]) + Balance([[ company.currency_id.code]]) Currency @@ -311,9 +311,9 @@ [[ o.code or '' ]] [[ o.name or '' ]] - [[formatLang(sum_debit_account(o, data['form'])) ]] - [[formatLang(sum_credit_account(o, data['form'])) ]] - [[formatLang(sum_balance_account(o, data['form'])) ]] + [[formatLang(sum_debit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]] + [[formatLang(sum_credit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]] + [[formatLang(sum_balance_account(o, data['form'])) ]] [[ company.currency_id.symbol ]] [[ o.currency_id and sum_currency_amount_account(o, data['form']) +o.currency_id.code or '' ]] @@ -333,9 +333,9 @@ [[ line['lref'] or '']] [[ line['move'] or '' ]] [[ line['lname'] or '' ]] - [[ formatLang(line['debit']) ]] - [[ formatLang(line['credit']) ]] - [[ formatLang(line['progress']) ]] + [[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]] [[ formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '']] diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index 7fbf9269320..ab338c43c32 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -142,12 +142,12 @@ - - + + - + - + @@ -160,7 +160,7 @@ - + @@ -194,9 +194,6 @@ [[ repeatIn(objects, 'a') ]] - - - @@ -246,9 +243,6 @@ - - - @@ -256,16 +250,16 @@ [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] Date - JNRL - Partner - Ref - Move - Entry Label - Counterpart - Debit - Credit - Balance - Currency + JNRL + Partner + Ref + Move + Entry Label + Counterpart + Debit([[ company.currency_id.code]]) + Credit([[ company.currency_id.code]]) + Balance([[ company.currency_id.code]]) + Currency
@@ -279,9 +273,9 @@ [[ o.code ]] [[ o.name ]] - [[formatLang(sum_debit_account(o, data['form'])) ]] - [[formatLang(sum_credit_account(o, data['form'])) ]] - [[formatLang(sum_balance_account(o, data['form'])) ]] + [[formatLang(sum_debit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]] + [[formatLang(sum_credit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]] + [[formatLang(sum_balance_account(o, data['form'])) ]] [[ company.currency_id.symbol ]] [[ o.currency_id and sum_currency_amount_account(o, data['form']) +o.currency_id.code or '' ]] @@ -305,9 +299,9 @@ [[ line['move'] ]] [[ line['lname'] ]] [[ strip_name(line['line_corresp'],15) ]] - [[ formatLang(line['debit']) ]] - [[ formatLang(line['credit']) ]] - [[ formatLang(line['progress']) ]] + [[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]] [[ formatLang(line['amount_currency'] or '')]] [[ line['currency_code'] or '' ]] @@ -316,16 +310,16 @@ [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] - JNRL - Date - Partner - Ref - Move - Entry Label - Counterpart - Debit - Credit - Balance + Date + JNRL + Partner + Ref + Move + Entry Label + Counterpart + Debit([[ company.currency_id.code]]) + Credit([[ company.currency_id.code]]) + Balance([[ company.currency_id.code]]) @@ -340,9 +334,9 @@ [[ o.code ]] [[ o.name ]] - [[formatLang(sum_debit_account(o, data['form'])) ]] - [[formatLang(sum_credit_account(o, data['form'])) ]] - [[formatLang(sum_balance_account(o, data['form'])) ]] + [[formatLang(sum_debit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]] + [[formatLang(sum_credit_account(o, data['form'])) ]] [[ company.currency_id.symbol ]] + [[formatLang(sum_balance_account(o, data['form'])) ]] [[ company.currency_id.symbol ]] @@ -365,12 +359,15 @@ [[ line['move'] ]] [[ line['lname'] ]] [[ strip_name(line['line_corresp'],15) ]] - [[ formatLang(line['debit']) ]] - [[ formatLang(line['credit']) ]] - [[ formatLang(line['progress']) ]] + [[ formatLang(line['debit']) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line['credit']) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]
+ + + diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index 86d4405838c..3b837f51844 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -97,7 +97,7 @@ - + @@ -200,7 +200,7 @@ - + Description @@ -212,22 +212,16 @@ State - Quantity + Quantity Location - - - - - -
[[ repeatIn([line for line in picking.move_lines if (line.state == 'confirmed' or line.state=='done' or line.state=='assigned')],'move_lines') ]] - [[ picking.move_lines or removeParentNode('blockTable')]] + [[ picking.move_lines or removeParentNode('blockTable')]] [ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] @@ -242,28 +236,20 @@ [[ move_lines.product_qty ]] - [[ move_lines.product_uom.name ]] + [[ move_lines.product_uom.name ]] [[ (move_lines.location_id and move_lines.location_id.name) or '' ]] - - - - - - - - - +
[[ ([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting' )]) and 'Non Assigned Products:' or removeParentNode('para') ]]
[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]] - [[ picking.move_lines or removeParentNode('blockTable')]] + [[ picking.move_lines or removeParentNode('blockTable')]] [ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] @@ -278,16 +264,13 @@ [[ move_lines.product_qty ]] - [[ move_lines.product_uom.name ]] + [[ move_lines.product_uom.name ]] [[ (move_lines.location_id and move_lines.location_id.name) or '' ]] - - -