From 92f7f6c994d2bf0d34297fb15840d66b1770f6ee Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Sun, 14 Nov 2010 14:57:22 +0530 Subject: [PATCH 01/15] [IMP]: Use capital letters for main words in Account and HR dashboard. bzr revid: rch@tinyerp.com-20101114092722-1x4m4nzmt64oe4xl --- addons/account/board_account_view.xml | 2 +- addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml index 528d986d729..bcedc3fa491 100644 --- a/addons/account/board_account_view.xml +++ b/addons/account/board_account_view.xml @@ -49,7 +49,7 @@ - + diff --git a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml index 792ea34ae53..96d91ef3e5c 100644 --- a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml +++ b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml @@ -68,7 +68,7 @@ - + From 9eb80e284c21c27057cf6ce2b788c39b0d9c271b Mon Sep 17 00:00:00 2001 From: vro Date: Tue, 16 Nov 2010 11:20:35 +0530 Subject: [PATCH 02/15] [IMP] Accounting: Added for column headers bzr revid: vro@tinyerp.com-20101116055035-wcos2qdbsry9m1j3 --- .../account/report/account_print_invoice.rml | 26 +++++++++++++++ .../account/report/account_print_overdue.rml | 32 +++++++++++++++++++ .../account/report/account_voucher_print.rml | 17 ++++++++++ .../report/report_account_invoice_layout.rml | 23 +++++++++++++ .../report/special_message_invoice.rml | 23 +++++++++++++ addons/account_payment/report/order.rml | 26 +++++++++++++++ 6 files changed, 147 insertions(+) diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml index c6057627b32..6e67879d81c 100644 --- a/addons/account/report/account_print_invoice.rml +++ b/addons/account/report/account_print_invoice.rml @@ -130,6 +130,31 @@ + + + + + + Description + + + Taxes + + + Quantity + + + Unit Price + + + Disc.(%) + + + Price + + + + [[ repeatIn(objects,'o') ]] [[ setLang(o.partner_id.lang) ]] @@ -378,5 +403,6 @@ + \ No newline at end of file diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml index 61533a2966c..4dfe08c0bac 100644 --- a/addons/account/report/account_print_overdue.rml +++ b/addons/account/report/account_print_overdue.rml @@ -89,6 +89,37 @@ + + + + + + Date + + + Description + + + Ref + + + Maturity date + + + Due + + + Paid + + + Maturity + + + Li. + + + + [[ repeatIn(objects,'o') ]] [[ setLang(o.lang) ]] @@ -253,5 +284,6 @@ + \ No newline at end of file diff --git a/addons/account/report/account_voucher_print.rml b/addons/account/report/account_voucher_print.rml index f84a93fbfdd..3e3d8990758 100644 --- a/addons/account/report/account_voucher_print.rml +++ b/addons/account/report/account_voucher_print.rml @@ -162,6 +162,22 @@ + + + + + + Particulars + + + Debit + + + Credit + + + + [[ repeatIn(objects,'voucher') ]] @@ -449,5 +465,6 @@ + diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml index 1eac32853e5..7841a3a0d47 100644 --- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml +++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml @@ -174,6 +174,28 @@ + + + + + + Description / Taxes + + + Quantity + + + Unit Price + + + Disc. (%) + + + Price + + + + [[ repeatIn(objects,'o') ]] [[ setLang(o.partner_id.lang) ]] @@ -469,5 +491,6 @@ + \ No newline at end of file diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml index 282dce2d988..ab7f02f0b6d 100644 --- a/addons/account_invoice_layout/report/special_message_invoice.rml +++ b/addons/account_invoice_layout/report/special_message_invoice.rml @@ -178,6 +178,28 @@ + + + + + + Description / Taxes + + + Quantity + + + Unit Price + + + Disc. (%) + + + Price + + + + [[ repeatIn(objects,'o') ]] [[ setLang(o.partner_id.lang) ]] @@ -487,5 +509,6 @@ + \ No newline at end of file diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml index 79e548e53c9..6c4ec276062 100644 --- a/addons/account_payment/report/order.rml +++ b/addons/account_payment/report/order.rml @@ -121,6 +121,31 @@ + + + + + + Partner + + + Bank Account + + + Invoice Ref + + + Value Date + + + Amount + + + Currency + + + + [[ repeatIn(objects, 'o') ]] @@ -260,5 +285,6 @@ + \ No newline at end of file From bf79acc36cd36d3dba7d9905237827bacd935784 Mon Sep 17 00:00:00 2001 From: vro Date: Tue, 16 Nov 2010 11:24:16 +0530 Subject: [PATCH 03/15] [IMP] Added for report column headers bzr revid: vro@tinyerp.com-20101116055416-ymr44rsjks5f118q --- addons/delivery/report/shipping.rml | 17 ++++++++++ addons/hr_expense/report/expense.rml | 26 +++++++++++++++ addons/hr_payroll/report/payroll_register.rml | 32 +++++++++++++++++++ .../report/report_emp_salary_structure.rml | 20 ++++++++++++ .../report/report_payroll_advice.rml | 26 +++++++++++++++ addons/lunch/report/order.rml | 20 ++++++++++++ addons/mrp/report/order.rml | 20 ++++++++++++ addons/mrp_repair/report/order.rml | 23 +++++++++++++ 8 files changed, 184 insertions(+) diff --git a/addons/delivery/report/shipping.rml b/addons/delivery/report/shipping.rml index 8ba9342af9e..42fcd71a693 100644 --- a/addons/delivery/report/shipping.rml +++ b/addons/delivery/report/shipping.rml @@ -105,6 +105,22 @@ + + + + + + Description + + + Lot + + + Quantity + + + + [[repeatIn(objects,'o')]] @@ -208,5 +224,6 @@ + \ No newline at end of file diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml index dbc3c09d9c6..b12971564b1 100644 --- a/addons/hr_expense/report/expense.rml +++ b/addons/hr_expense/report/expense.rml @@ -111,6 +111,31 @@ + + + + + + Date + + + Name + + + Ref. + + + Unit Price + + + Qty + + + Total Price + + + + [[ repeatIn(objects,'o') ]] @@ -272,5 +297,6 @@ This document must be dated and signed for reimbursement + diff --git a/addons/hr_payroll/report/payroll_register.rml b/addons/hr_payroll/report/payroll_register.rml index 7ad99b46502..e47a7bfd870 100644 --- a/addons/hr_payroll/report/payroll_register.rml +++ b/addons/hr_payroll/report/payroll_register.rml @@ -88,6 +88,37 @@ + + + + + + # + + + Employee Name + + + Basic + + + Others + + + Allowances + + + Gross Sal. + + + Deduction + + + Net Sal. + + + + [[ repeatIn(objects, 'o') ]] Salary Payment Register [[o.name]] @@ -226,5 +257,6 @@ + \ No newline at end of file diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml index 5f81a0942ae..4c1d05c6cb2 100644 --- a/addons/hr_payroll/report/report_emp_salary_structure.rml +++ b/addons/hr_payroll/report/report_emp_salary_structure.rml @@ -262,6 +262,25 @@ + + + + + + Code + + + Name + + + Amount + + + Amount Type + + + + [[repeatIn(objects,'employee')]] @@ -554,5 +573,6 @@ + diff --git a/addons/hr_payroll/report/report_payroll_advice.rml b/addons/hr_payroll/report/report_payroll_advice.rml index 18f56cc9883..bd1b0c632cd 100644 --- a/addons/hr_payroll/report/report_payroll_advice.rml +++ b/addons/hr_payroll/report/report_payroll_advice.rml @@ -125,6 +125,31 @@ + + + + + + SI. No. + + + Name of the Employee + + + Amount + + + By Salary + + + Bank Account + + + C/D + + + + [[repeatIn(objects,'o')]] @@ -334,5 +359,6 @@ + \ No newline at end of file diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml index ba66dcddb03..05a1b69c446 100644 --- a/addons/lunch/report/order.rml +++ b/addons/lunch/report/order.rml @@ -71,6 +71,25 @@ + + + + + + Name/Date + + + Order + + + Description + + + Unit Price + + + + @@ -163,5 +182,6 @@ + \ No newline at end of file diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml index e07966ff5c9..feb1515218b 100644 --- a/addons/mrp/report/order.rml +++ b/addons/mrp/report/order.rml @@ -173,6 +173,25 @@ + + + + + + Product + + + Quantity + + + Source Location + + + Destination Location + + + + [[repeatIn(objects,'o')]] @@ -368,5 +387,6 @@ + \ No newline at end of file diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml index cafadca5aa2..b0f197a2f1d 100644 --- a/addons/mrp_repair/report/order.rml +++ b/addons/mrp_repair/report/order.rml @@ -161,6 +161,28 @@ + + + + + + Description + + + VAT + + + Quantity + + + Unit Price + + + Price + + + + [[ repeatIn(objects,'o') ]] @@ -390,5 +412,6 @@ + From 4f07379397acde1ae9715355917a403dddb3992a Mon Sep 17 00:00:00 2001 From: vro Date: Tue, 16 Nov 2010 11:27:31 +0530 Subject: [PATCH 04/15] [IMP]: Added for report column headers bzr revid: vro@tinyerp.com-20101116055731-qhkongmgqv52df5d --- .../report/account_statement.rml | 17 ++++++++++++ addons/product/report/product_pricelist.rml | 27 +++++++++++++++++++ addons/purchase/report/order.rml | 26 ++++++++++++++++++ addons/purchase/report/request_quotation.rml | 17 ++++++++++++ .../report/purchase_requisition.rml | 17 ++++++++++++ addons/sale/report/sale_order.rml | 26 ++++++++++++++++++ .../sale_layout/report/report_sale_layout.rml | 26 ++++++++++++++++++ 7 files changed, 156 insertions(+) diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml index ebdc554769e..c61d0347d84 100644 --- a/addons/point_of_sale/report/account_statement.rml +++ b/addons/point_of_sale/report/account_statement.rml @@ -136,6 +136,22 @@ + + + + + + Name + + + Partner + + + Amount + + + + [[ repeatIn(objects,'statement') ]] Statement @@ -264,5 +280,6 @@ + \ No newline at end of file diff --git a/addons/product/report/product_pricelist.rml b/addons/product/report/product_pricelist.rml index 5d3a39e9144..40ae456224d 100644 --- a/addons/product/report/product_pricelist.rml +++ b/addons/product/report/product_pricelist.rml @@ -127,6 +127,32 @@ + + + + + + Description + [[repeatIn(get_titles(data['form']), 'k')]] + + + [[ (k.has_key('qty1') and k['qty1']) or '' ]] + + + [[ (k.has_key('qty2') and k['qty2']) or '' ]] + + + [[ (k.has_key('qty3') and k['qty3']) or '' ]] + + + [[ (k.has_key('qty4') and k['qty4']) or '' ]] + + + [[ (k.has_key('qty5') and k['qty5']) or '' ]] + + + + @@ -235,5 +261,6 @@ + \ No newline at end of file diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index 0ca1a8d6878..f9782edfb6d 100644 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -129,6 +129,31 @@ + + + + + + Description + + + Taxes + + + Date Req. + + + Qty + + + Unit Price + + + Net Price + + + + [[repeatIn(objects,'o')]] [[ setLang(o.partner_id.lang) ]] @@ -357,5 +382,6 @@ + \ No newline at end of file diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml index edc82087e5a..27e4ac39602 100644 --- a/addons/purchase/report/request_quotation.rml +++ b/addons/purchase/report/request_quotation.rml @@ -69,6 +69,22 @@ + + + + + + Description + + + Expected Date + + + Qty + + + + [[repeatIn(objects,'order')]] [[ setLang(order.partner_id.lang) ]] @@ -162,5 +178,6 @@ [[ user.signature or '' ]] + \ No newline at end of file diff --git a/addons/purchase_requisition/report/purchase_requisition.rml b/addons/purchase_requisition/report/purchase_requisition.rml index e7734ce54a0..da9ec19492f 100644 --- a/addons/purchase_requisition/report/purchase_requisition.rml +++ b/addons/purchase_requisition/report/purchase_requisition.rml @@ -112,6 +112,22 @@ + + + + + + Description [[ requisition.line_ids==[] and removeParentNode('blockTable') ]] + + + Qty + + + Product UoM + + + + [[ repeatIn(objects,'requisition') ]] @@ -218,5 +234,6 @@ + \ No newline at end of file diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml index 515aa9f74d8..5f5e84f4ac0 100644 --- a/addons/sale/report/sale_order.rml +++ b/addons/sale/report/sale_order.rml @@ -126,6 +126,31 @@ + + + + + + Description + + + VAT + + + Quantity + + + Unit Price + + + Disc.(%) + + + Price + + + + [[repeatIn(objects,'o')]] [[ setLang(o.partner_id.lang) ]] @@ -360,5 +385,6 @@ + diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml index e203ae5dd2b..fd9cbe90bf8 100755 --- a/addons/sale_layout/report/report_sale_layout.rml +++ b/addons/sale_layout/report/report_sale_layout.rml @@ -133,6 +133,31 @@ + + + + + + Description + + + VAT + + + Quantity + + + Unit Price + + + Disc.(%) + + + Price + + + + [[repeatIn(objects,'o')]] [[ setLang(o.partner_id.lang) ]] @@ -371,5 +396,6 @@ + \ No newline at end of file From 46d38a468c50c7da247c5b98f42df51712118436 Mon Sep 17 00:00:00 2001 From: vro Date: Tue, 16 Nov 2010 11:50:22 +0530 Subject: [PATCH 05/15] [IMP]: Stock: Added for report column headers bzr revid: vro@tinyerp.com-20101116062022-w8dcwj872jo2yp6w --- addons/stock/report/lot_overview.rml | 23 ++++++++++++++++++++ addons/stock/report/lot_overview_all.rml | 23 ++++++++++++++++++++ addons/stock/report/picking.rml | 23 ++++++++++++++++++++ addons/stock/report/stock_inventory_move.rml | 20 +++++++++++++++++ 4 files changed, 89 insertions(+) diff --git a/addons/stock/report/lot_overview.rml b/addons/stock/report/lot_overview.rml index aae5abacf0a..bbf007e1ea6 100644 --- a/addons/stock/report/lot_overview.rml +++ b/addons/stock/report/lot_overview.rml @@ -88,6 +88,28 @@ + + + + + + Location / Product + + + Variants + + + Quantity + + + Unit Price + + + Value + + + + @@ -200,5 +222,6 @@ + \ No newline at end of file diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml index e5aca0e3035..1dc54ff69ac 100644 --- a/addons/stock/report/lot_overview_all.rml +++ b/addons/stock/report/lot_overview_all.rml @@ -88,6 +88,28 @@ + + + + + + Location / Product + + + Variants + + + Quantity + + + Unit Price + + + Value + + + + @@ -200,5 +222,6 @@ + \ No newline at end of file diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index cc6923ac545..94bf69479ac 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -123,6 +123,28 @@ + + + + + + Description + + + Lot + + + State + + + Location + + + Quantity + + + + [[repeatIn(objects,'picking')]] @@ -285,5 +307,6 @@ + \ No newline at end of file diff --git a/addons/stock/report/stock_inventory_move.rml b/addons/stock/report/stock_inventory_move.rml index a6f8971ac6d..d7bbc2cbd2a 100755 --- a/addons/stock/report/stock_inventory_move.rml +++ b/addons/stock/report/stock_inventory_move.rml @@ -104,6 +104,25 @@ + + + + + + Location + + + Production Lot + + + Product + + + Quantity + + + + [[ repeatIn(objects,'o') ]] @@ -197,5 +216,6 @@ + \ No newline at end of file From 1f52993745f986d89611fc7f877684dd7d893411 Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Tue, 16 Nov 2010 12:44:49 +0530 Subject: [PATCH 06/15] [IMP]: Sale Dashboard - Reduce Code. bzr revid: rch@tinyerp.com-20101116071449-t3z7e4wl7i3gro05 --- addons/sale_crm/board_sale_crm_view.xml | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/addons/sale_crm/board_sale_crm_view.xml b/addons/sale_crm/board_sale_crm_view.xml index 58ebdc07cf6..486ffa28850 100644 --- a/addons/sale_crm/board_sale_crm_view.xml +++ b/addons/sale_crm/board_sale_crm_view.xml @@ -62,28 +62,17 @@ - - board.crm.form.inherit.child2 - board.board - form - - - - - - - - - + board.crm.form.inherit.replace1 board.board form + From 82d4ad7932312cfe7141c848a911a2ea46ce4228 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Thu, 18 Nov 2010 15:59:36 +0530 Subject: [PATCH 07/15] =?UTF-8?q?[IMP]:account:improved=20general=20ledger?= =?UTF-8?q?=20report=20with=20reduce=20size=20of=20date=20to=20allow=20mor?= =?UTF-8?q?e=20space=20for=20partner=20and=20also=20set=20general=20rule?= =?UTF-8?q?=20for=20debit/credit/balance=20columns=20is=20that=20they=20sh?= =?UTF-8?q?ould=20be=20able=20to=20display=201.000.000.000,00=20=E2=82=AC?= =?UTF-8?q?=20on=20the=20same=20line?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bzr revid: apa@tinyerp.com-20101118102936-ba7n221pxd7nr3yp --- .../account/report/account_general_ledger.rml | 39 ++++++++----------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml index 2a3bfda8e48..78a5fd35a46 100644 --- a/addons/account/report/account_general_ledger.rml +++ b/addons/account/report/account_general_ledger.rml @@ -3,9 +3,6 @@ @@ -93,7 +90,6 @@ - @@ -135,7 +131,6 @@ - @@ -179,24 +174,24 @@ - [[data['form']['amount_currency'] == False or removeParentNode('blockTable')]] + [[data['form']['amount_currency'] == False or removeParentNode('blockTable')]] Date Partner - Ref - Move + Ref + Move Entry Label Debit Credit Balance - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] Date Partner - Ref - Move + Ref + Move Entry Label Debit Credit @@ -265,12 +260,12 @@ - [[data['form']['amount_currency'] == False or removeParentNode('blockTable')]] + [[data['form']['amount_currency'] == False or removeParentNode('blockTable')]] Date Partner - Ref - Move + Ref + Move Entry Label Debit Credit @@ -279,10 +274,10 @@
[[ repeatIn(get_children_accounts(a), 'o') ]] - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] - + [[ '..'*(o.level-1) ]][[ o.code or '']] [[ o.name or '']] @@ -313,14 +308,12 @@
- - - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] Date Partner - Ref - Move + Ref + Move Entry Label Debit Credit @@ -330,10 +323,10 @@
[[ repeatIn(get_children_accounts(a), 'o') ]] - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] - + [[ '..'*(o.level-1) ]][[ o.code or '' ]] [[ o.name or '' ]] From 5c4683dcf3b7c30574d9f901840e38b8dafaf2f9 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Thu, 18 Nov 2010 16:11:00 +0530 Subject: [PATCH 08/15] =?UTF-8?q?[IMP]:account:improved=20general=20ledger?= =?UTF-8?q?=20landscape=20with=20reduce=20size=20of=20date=20to=20allow=20?= =?UTF-8?q?more=20space=20for=20journal=20and=20also=20set=20general=20rul?= =?UTF-8?q?e=20for=20debit/credit/balance=20columns=20is=20that=20they=20s?= =?UTF-8?q?hould=20be=20able=20to=20display=201.000.000.000,00=20=E2=82=AC?= =?UTF-8?q?=20on=20the=20same=20line.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bzr revid: apa@tinyerp.com-20101118104100-wo3amck0d409xr15 --- .../account/report/account_general_ledger_landscape.rml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index 430bde219e1..89a227483cd 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -272,7 +272,7 @@ - [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] + [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] Date JNRL @@ -291,7 +291,7 @@ [[ repeatIn(get_children_accounts(a), 'o') ]] - [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] + [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] @@ -333,7 +333,7 @@
- [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] Date JNRL @@ -352,7 +352,7 @@ [[ repeatIn(get_children_accounts(a), 'o') ]] - [[data['form']['amount_currency'] == False or removeParentNode('blockTable')]] + [[data['form']['amount_currency'] == False or removeParentNode('blockTable')]] From 3c2c83077644b73051eceecf637d88e05522815d Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Thu, 18 Nov 2010 16:37:28 +0530 Subject: [PATCH 09/15] =?UTF-8?q?[IMP]:account:improved=20Journal=20report?= =?UTF-8?q?=20with=20set=20general=20rule=20for=20debit/credit/balance=20c?= =?UTF-8?q?olumns=20is=20that=20they=20should=20be=20able=20to=20display?= =?UTF-8?q?=201.000.000.000,00=20=E2=82=AC=20on=20the=20same=20line.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bzr revid: apa@tinyerp.com-20101118110728-pkremq7gxto0xk3n --- addons/account/report/account_journal.rml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index 7b4aaffc4ff..c2807a2e8a2 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -240,7 +240,7 @@ - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] Date Entry No @@ -274,7 +274,7 @@ - [[ display_currency(data) or removeParentNode('blockTable') ]] + [[ display_currency(data) or removeParentNode('blockTable') ]] Date Entry No From c2516bdce834688572a1a3f43ddfc4e38b6abaab Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Thu, 18 Nov 2010 17:26:06 +0530 Subject: [PATCH 10/15] Partner Ledger: ************** account-partner_ledger-other.pdf - fix row height! - display journal code instead of journal name_get - increase column ref of 2 digits - pdf title account-partner_ledger.pdf: - fix row height! - display journal code instead of journal name_get bzr revid: apa@tinyerp.com-20101118115606-at03l0m8rycms356 --- addons/account/account_report.xml | 2 +- .../account/report/account_partner_ledger.rml | 30 ++++++++--------- .../report/account_partner_ledger_other.rml | 33 +++++++++---------- 3 files changed, 32 insertions(+), 33 deletions(-) diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml index 58e13b1b7e6..2b1a403e461 100644 --- a/addons/account/account_report.xml +++ b/addons/account/account_report.xml @@ -3,7 +3,7 @@ - + diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml index b3a8e9f7fdc..96c0612d234 100644 --- a/addons/account/report/account_partner_ledger.rml +++ b/addons/account/report/account_partner_ledger.rml @@ -177,7 +177,7 @@ - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] Date @@ -186,7 +186,7 @@ JNRL - Ref. + Ref. Account @@ -205,7 +205,7 @@ - [[ display_currency(data) == True or removeParentNode('blockTable') ]] + [[ display_currency(data) == True or removeParentNode('blockTable') ]] Date @@ -214,10 +214,10 @@ JNRL - Ref. + Ref. - Account + Account Entry Label @@ -339,7 +339,7 @@ - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] Date @@ -348,7 +348,7 @@ JNRL - Ref. + Ref. Account @@ -373,7 +373,7 @@ - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] @@ -409,7 +409,7 @@
[[ repeatIn(lines(p), 'line') ]] - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] [[ formatLang(line['date'],date=True) ]] @@ -441,7 +441,7 @@
- [[ display_currency(data) == True or removeParentNode('blockTable') ]] + [[ display_currency(data) == True or removeParentNode('blockTable') ]] Date @@ -450,10 +450,10 @@ JNRL - Ref. + Ref. - Account + Account Entry Label @@ -478,7 +478,7 @@ - [[ display_currency(data) == True or removeParentNode('blockTable') ]] + [[ display_currency(data) == True or removeParentNode('blockTable') ]] @@ -522,7 +522,7 @@
[[ repeatIn(lines(p), 'line') ]] - [[ display_currency(data) == True or removeParentNode('blockTable') ]] + [[ display_currency(data) == True or removeParentNode('blockTable') ]] [[ formatLang(line['date'],date=True) ]] @@ -534,7 +534,7 @@ [[ line['move_name'] ]] - [[ line['a_code'] ]] + [[ line['a_code'] ]] [[ (line['ref'] or '') + ' ' + line['name'] ]] diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml index c3315dde64d..24ac80dfc38 100644 --- a/addons/account/report/account_partner_ledger_other.rml +++ b/addons/account/report/account_partner_ledger_other.rml @@ -309,7 +309,7 @@ - + @@ -333,7 +333,7 @@ - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] Date @@ -342,7 +342,7 @@ JNRL - Ref. + Ref. Account @@ -361,7 +361,7 @@ - [[ display_currency(data) == True or removeParentNode('blockTable') ]] +[[ display_currency(data) == True or removeParentNode('blockTable') ]] Date @@ -370,10 +370,10 @@ JNRL - Ref. + Ref. - Account + Account Entry Label @@ -494,7 +494,7 @@ - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] Date @@ -503,7 +503,7 @@ JNRL - Ref. + Ref. Account @@ -524,7 +524,7 @@
[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]] - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] @@ -557,7 +557,7 @@
[[ repeatIn(lines(p), 'line') ]] - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] [[ formatLang(line['date'],date=True) ]] @@ -587,7 +587,7 @@
- [[ display_currency(data) == True or removeParentNode('blockTable') ]] + [[ display_currency(data) == True or removeParentNode('blockTable') ]] Date @@ -596,10 +596,10 @@ JNRL - Ref. + Ref. - Account + Account Entry Label @@ -621,8 +621,7 @@
[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]] - [[ display_currency(data) == True or removeParentNode('blockTable') ]] - + [[ display_currency(data) == True or removeParentNode('blockTable') ]] [[ p.ref ]] - [[ p.name ]] @@ -662,7 +661,7 @@
[[ repeatIn(lines(p), 'line') ]] - [[ display_currency(data) == True or removeParentNode('blockTable') ]] + [[ display_currency(data) == True or removeParentNode('blockTable') ]] [[ formatLang(line['date'],date=True) ]] @@ -674,7 +673,7 @@ [[ line['move_name'] ]] - [[ line['a_code'] ]] + [[ line['a_code'] ]] [[ (line['ref'] or '') + ' ' + line['name'] ]] From c63030a9d92c6e523c4266179dd288cb2ca99c57 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Fri, 19 Nov 2010 15:09:41 +0530 Subject: [PATCH 11/15] [ADD/IMP]:account:Changed the size of landscape report in General ledger Report. bzr revid: apa@tinyerp.com-20101119093941-lxrkujkwmqz1yfmu --- .../account_general_ledger_landscape.rml | 949 +++++++++++------- 1 file changed, 591 insertions(+), 358 deletions(-) diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index 93cb6aead3c..b8797cd67a8 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -1,399 +1,632 @@ -