From 901d5ab8e4acec19b5b91b3cc060c18be8f263b9 Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Fri, 10 Dec 2010 11:49:51 +0530 Subject: [PATCH 01/54] [IMP]:Survey *Survey answers : -rename Answer By (on the top left), into "Answered by" -if it is answer date, rebame into "Answer Date" -If it is print date, rename into print date -the print date should be the first date (top left) and the Answer Date should be below "Answered by" (top right) bzr revid: apa@tinyerp.com-20101210061951-9mfnnselkogw50t2 --- .../survey/report/survey_browse_response.py | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py index 9fa338b2608..282fea1832f 100644 --- a/addons/survey/report/survey_browse_response.py +++ b/addons/survey/report/survey_browse_response.py @@ -25,6 +25,7 @@ from report.interface import report_rml from tools import to_xml import tools import time +from report import report_sxw class survey_browse_response(report_rml): def create(self, cr, uid, ids, datas, context): @@ -176,6 +177,7 @@ class survey_browse_response(report_rml): + @@ -186,6 +188,7 @@ class survey_browse_response(report_rml): """ surv_resp_obj = pooler.get_pool(cr.dbname).get('survey.response') + rml_obj=report_sxw.rml_parse(cr, uid, surv_resp_obj._name,context) if datas.has_key('form') and datas['form'].has_key('response_ids'): response_id = datas['form']['response_ids'] elif context.has_key('response_id') and context['response_id']: @@ -200,15 +203,22 @@ class survey_browse_response(report_rml): for response in surv_resp_obj.browse(cr, uid, response_id): for survey in surv_obj.browse(cr, uid, [response.survey_id.id]): tbl_width = float(_tbl_widths.replace('cm', '')) - colwidth = "4.6cm,5cm," + str(tbl_width - 16.4) +"cm,4cm,3cm" + colwidth = "2.5cm,4.8cm," + str(tbl_width - 15.0) +"cm,3.2cm,4.5cm" resp_create = tools.ustr(time.strftime('%d-%m-%Y %I:%M:%S %p', time.strptime(response.date_create.split('.')[0], '%Y-%m-%d %H:%M:%S'))) rml += """ - Answer Create Date:- - """ + to_xml(resp_create) + """ - - Answer By:- - """ + to_xml(response.user_id.login or '') + """ + Print Date : + """ + to_xml(rml_obj.formatLang(time.strftime("%Y-%m-%d %H:%M:%S"),date_time=True)) + """ + + Answered by : + """ + to_xml(response.user_id.login or '') + """ + + + + + + Answer Date : + """ + to_xml(resp_create) + """ """ From ac7f983b7356cf54d7ac5271d8a119f6024e4f0e Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Fri, 10 Dec 2010 11:56:07 +0530 Subject: [PATCH 02/54] [IMP]:Survey *Answer Summary -rename the title "Answer Summary" into "Answers Summary" bzr revid: apa@tinyerp.com-20101210062607-bs0gxwpx4kzmw2vz --- addons/survey/report/survey_analysis_report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py index 34bcd366d0f..f171eb428b3 100644 --- a/addons/survey/report/survey_analysis_report.py +++ b/addons/survey/report/survey_analysis_report.py @@ -118,7 +118,7 @@ class survey_analysis(report_rml): for survey in surv_obj.browse(cr, uid, ids): rml += """ - Answer Summary + Answers Summary From 352898e56a668a95768438be4625116b65a3ebc0 Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Fri, 10 Dec 2010 12:20:56 +0530 Subject: [PATCH 03/54] [IMP]:account *Journal print (journal balance) -add more spaces between the contents of 2 firts columns (Date and Ref) (instead of 05/26/2010SAJ2010001, it should be 05/26/2010 SAJ2010001 bzr revid: apa@tinyerp.com-20101210065056-1p02qfg4byiqxk10 --- 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 a81c634ddc8..f2a932ce451 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -229,7 +229,7 @@ - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] Date Ref @@ -263,7 +263,7 @@ - [[ display_currency(data) or removeParentNode('blockTable') ]] + [[ display_currency(data) or removeParentNode('blockTable') ]] Date Ref From 11b60a3c6f9ba010bc9fad90f34d2df44595004c Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Fri, 10 Dec 2010 12:32:35 +0530 Subject: [PATCH 04/54] [IMP]:stock *Packing list -try to align the content of the columns "Sate" to the title state (Done is too on the left from State) bzr revid: apa@tinyerp.com-20101210070235-6113c9366gi2wlmu --- addons/stock/report/picking.rml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index 94bf69479ac..bbb3f25683b 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -231,7 +231,7 @@ Lot - State + State Location @@ -309,4 +309,4 @@ - \ No newline at end of file + From a702d6458fcf0468120fbf2caf2d1e857f4dd9da Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Fri, 10 Dec 2010 12:43:24 +0530 Subject: [PATCH 05/54] =?UTF-8?q?[IMP]:sale=20*Quotation=20n=C2=B0...=20?= =?UTF-8?q?=20-the=20":"=20of=20Nets=20Total=20is=20bellow=20the=20label,?= =?UTF-8?q?=20it=20should=20be=20near=20the=20label=20"Net=20Total=20:"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bzr revid: apa@tinyerp.com-20101210071324-mlyh7zh2jcwh3jau --- addons/sale/report/sale_order.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml index 5f5e84f4ac0..8c2fa74ff8e 100644 --- a/addons/sale/report/sale_order.rml +++ b/addons/sale/report/sale_order.rml @@ -326,7 +326,7 @@ - + From bf67a0ec849e1fdf0763ca48547b76c6edaf22d6 Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Fri, 10 Dec 2010 15:55:27 +0530 Subject: [PATCH 06/54] [IMP]:account *Invoice : -rename Partner Ref. into Your Reference bzr revid: apa@tinyerp.com-20101210102527-zq7ldy7f1bwmi43b --- addons/account/report/account_print_invoice.rml | 6 +++--- .../report/report_account_invoice_layout.rml | 4 ++-- .../report/special_message_invoice.rml | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml index c8baffdb092..82ad0fca034 100644 --- a/addons/account/report/account_print_invoice.rml +++ b/addons/account/report/account_print_invoice.rml @@ -199,7 +199,7 @@ Invoice Date - Partner Ref. + Your Reference @@ -296,7 +296,7 @@ - + @@ -405,4 +405,4 @@ - \ No newline at end of file + 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 34eb5d47da1..bd75b7ec8f1 100644 --- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml +++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml @@ -246,7 +246,7 @@ Invoice Date - Partner Ref. + Your Reference @@ -493,4 +493,4 @@ - \ 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 2d448a3b800..1bf284d434f 100644 --- a/addons/account_invoice_layout/report/special_message_invoice.rml +++ b/addons/account_invoice_layout/report/special_message_invoice.rml @@ -250,7 +250,7 @@ Invoice Date - Partner Ref. + Your Reference @@ -382,7 +382,7 @@ - + @@ -390,14 +390,14 @@ - Net Total: + Net Total : [[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] - + @@ -405,14 +405,14 @@ - Taxes: + Taxes : [[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] - + @@ -420,7 +420,7 @@ - Total: + Total : [[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] @@ -511,4 +511,4 @@ - \ No newline at end of file + From 66c202f92386de346b0b252c50eed2ce1ef07d9c Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Tue, 14 Dec 2010 16:37:42 +0530 Subject: [PATCH 07/54] [IMP]:account:Improved Journal report. bzr revid: apa@tinyerp.com-20101214110742-3c10d8cpxaq9c60o --- addons/account/report/account_journal.rml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index f2a932ce451..d71f7b8ba41 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -229,7 +229,7 @@ - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] Date Ref @@ -256,14 +256,14 @@ [[ strip_name(line.ref,20) ]] [[ line.move_id.name <> '/' and line.move_id.name or ('*'+str(line.move_id.id)) ]] [[ line.account_id.code ]] - [[ line.partner_id and strip_name(line.partner_id.name,16) ]] - [[ strip_name(line.name,35) ]] + [[ line.partner_id and strip_name(line.partner_id.name,17) ]] + [[ strip_name(line.name,28) ]] [[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]] [[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]] - [[ display_currency(data) or removeParentNode('blockTable') ]] + [[ display_currency(data) or removeParentNode('blockTable') ]] Date Ref @@ -293,8 +293,8 @@ [[ strip_name(line.ref,20) ]] [[ line.move_id.name <> '/' and line.move_id.name or ('*'+str(line.move_id.id)) ]] [[ line.account_id.code ]] - [[ line.partner_id and strip_name(line.partner_id.name,16) ]] - [[ strip_name(line.name,17) ]] + [[ line.partner_id and strip_name(line.partner_id.name,15) ]] + [[ strip_name(line.name,18) ]] [[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]] [[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]] [[ line.currency_id and formatLang(line.amount_currency) or '' ]] [[ line.currency_id.symbol or '']] From d380803ee95cab37d3300deed9d2f0d268ca00eb Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Wed, 15 Dec 2010 12:19:36 +0530 Subject: [PATCH 08/54] [IMP]:account:improve journal report bzr revid: apa@tinyerp.com-20101215064936-w4lodivyiu7f3abm --- 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 d71f7b8ba41..9b0ac55bb56 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -257,7 +257,7 @@ [[ line.move_id.name <> '/' and line.move_id.name or ('*'+str(line.move_id.id)) ]] [[ line.account_id.code ]] [[ line.partner_id and strip_name(line.partner_id.name,17) ]] - [[ strip_name(line.name,28) ]] + [[ strip_name(line.name,27) ]] [[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]] [[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]] @@ -294,7 +294,7 @@ [[ line.move_id.name <> '/' and line.move_id.name or ('*'+str(line.move_id.id)) ]] [[ line.account_id.code ]] [[ line.partner_id and strip_name(line.partner_id.name,15) ]] - [[ strip_name(line.name,18) ]] + [[ strip_name(line.name,17) ]] [[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]] [[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]] [[ line.currency_id and formatLang(line.amount_currency) or '' ]] [[ line.currency_id.symbol or '']] From d9861ab7098fb44ee8dd38802a2299c24326cafb Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Wed, 15 Dec 2010 13:59:22 +0530 Subject: [PATCH 09/54] [IMP]:account:improved partner ledger reports bzr revid: apa@tinyerp.com-20101215082922-p67ea73yoenjdrhd --- .../account/report/account_partner_ledger.rml | 64 ++++++++-------- .../report/account_partner_ledger_other.rml | 74 +++++++++---------- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml index 1a32bc13bde..a39d40a0e14 100644 --- a/addons/account/report/account_partner_ledger.rml +++ b/addons/account/report/account_partner_ledger.rml @@ -262,11 +262,11 @@ - + - + @@ -274,7 +274,7 @@ - + [[ display_currency(data) == False or removeParentNode('blockTable') ]] @@ -303,7 +303,7 @@ - + [[ display_currency(data) == True or removeParentNode('blockTable') ]] @@ -439,7 +439,7 @@ [[ display_currency(data) == False or removeParentNode('section') ]] - + Date @@ -490,47 +490,47 @@ - Initial Balance + Initial Balance - [[ formatLang(get_intial_balance(p)[0][0])]] + [[ formatLang(get_intial_balance(p)[0][0])]] - [[ formatLang(get_intial_balance(p)[0][1]) ]] + [[ formatLang(get_intial_balance(p)[0][1]) ]] - [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]
[[ repeatIn(lines(p), 'line') ]] - + - [[ formatLang(line['date'],date=True) ]] + [[ formatLang(line['date'],date=True) ]] - [[ line['code'] ]] + [[ line['code'] ]] - [[ line['move_name'] ]] + [[ line['move_name'] ]] - [[ line['a_code'] ]] + [[ line['a_code'] ]] - [[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]] + [[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]] - [[ formatLang((line['debit'])) ]] + [[ formatLang((line['debit'])) ]] - [[ formatLang((line['credit'])) ]] + [[ formatLang((line['credit'])) ]] - [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] + [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] @@ -540,7 +540,7 @@ [[ display_currency(data) == True or removeParentNode('section') ]] - + Date @@ -571,7 +571,7 @@ - + [[ p.ref ]] - [[ p.name ]] @@ -594,7 +594,7 @@
[[ data['form']['initial_balance']==True or removeParentNode('section') ]] - + Initial Balance @@ -618,35 +618,35 @@
[[ repeatIn(lines(p), 'line') ]] - + - [[ formatLang(line['date'],date=True) ]] + [[ formatLang(line['date'],date=True) ]] - [[ line['code'] ]] + [[ line['code'] ]] - [[ line['move_name'] ]] + [[ line['move_name'] ]] - [[ line['a_code'] ]] + [[ line['a_code'] ]] - [[ strip_name(line['ref'],5) ]] - [[ strip_name(line['name'],5) ]] + [[ strip_name(line['ref'],8) ]] - [[ strip_name(line['name'],7) ]] - [[ formatLang((line['debit'])) ]] + [[ formatLang((line['debit'])) ]] - [[ formatLang((line['credit'])) ]] + [[ formatLang((line['credit'])) ]] - [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] + [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] - [[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]] + [[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]] @@ -655,4 +655,4 @@
- \ No newline at end of file + diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml index b3dec993cdb..358f2e7ebbe 100644 --- a/addons/account/report/account_partner_ledger_other.rml +++ b/addons/account/report/account_partner_ledger_other.rml @@ -262,11 +262,11 @@ - + - + @@ -274,7 +274,7 @@ - + [[ display_currency(data) == False or removeParentNode('blockTable') ]] @@ -303,7 +303,7 @@ - + [[ display_currency(data) == True or removeParentNode('blockTable') ]] @@ -434,7 +434,7 @@ - + [[ display_currency(data) == False or removeParentNode('blockTable') ]] @@ -493,53 +493,53 @@ - Initial Balance + Initial Balance - [[ formatLang(get_intial_balance(p)[0][0])]] + [[ formatLang(get_intial_balance(p)[0][0])]] - [[ formatLang(get_intial_balance(p)[0][1]) ]] + [[ formatLang(get_intial_balance(p)[0][1]) ]] - [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]
[[ repeatIn(lines(p), 'line') ]] - + - [[ formatLang(line['date'],date=True) ]] + [[ formatLang(line['date'],date=True) ]] - [[ line['code'] ]] + [[ line['code'] ]] - [[ line['move_name'] ]] + [[ line['move_name'] ]] - [[ line['a_code'] ]] + [[ line['a_code'] ]] - [[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]] + [[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]] - [[ formatLang((line['debit'])) ]] + [[ formatLang((line['debit'])) ]] - [[ formatLang((line['credit'])) ]] + [[ formatLang((line['credit'])) ]] - [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] + [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]
- + [[ display_currency(data) == True or removeParentNode('blockTable') ]] @@ -578,7 +578,7 @@ [[ display_currency(data) == True or removeParentNode('section') ]] - + [[ p.ref ]] - [[ p.name ]] @@ -601,22 +601,22 @@
[[ data['form']['initial_balance']==True or removeParentNode('section') ]] - + - Initial Balance + Initial Balance - [[ formatLang(get_intial_balance(p)[0][0])]] + [[ formatLang(get_intial_balance(p)[0][0])]] - [[ formatLang(get_intial_balance(p)[0][1]) ]] + [[ formatLang(get_intial_balance(p)[0][1]) ]] - [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]] - + @@ -625,35 +625,35 @@
[[ repeatIn(lines(p), 'line') ]] - + - [[ formatLang(line['date'],date=True) ]] + [[ formatLang(line['date'],date=True) ]] - [[ line['code'] ]] + [[ line['code'] ]] - [[ line['move_name'] ]] + [[ line['move_name'] ]] - [[ line['a_code'] ]] + [[ line['a_code'] ]] - [[ strip_name(line['ref'],5) ]] - [[ strip_name(line['name'],5) ]] + [[ strip_name(line['ref'],8) ]] - [[ strip_name(line['name'],7) ]] - [[ formatLang((line['debit'])) ]] + [[ formatLang((line['debit'])) ]] - [[ formatLang((line['credit'])) ]] + [[ formatLang((line['credit'])) ]] - [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] + [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] - [[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]] + [[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]] @@ -662,4 +662,4 @@
- \ No newline at end of file + From 0eaa621a549ddd4c353242f7063562670957f265 Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Wed, 15 Dec 2010 14:27:24 +0530 Subject: [PATCH 10/54] [IMP]:account:improved account reports bzr revid: apa@tinyerp.com-20101215085724-46pvz8dn99uxbn0q --- .../account/report/account_partner_ledger.rml | 120 +++++++++--------- .../report/account_partner_ledger_other.rml | 118 ++++++++--------- .../account/report/account_print_invoice.rml | 32 ++--- 3 files changed, 134 insertions(+), 136 deletions(-) diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml index a39d40a0e14..69faa977da1 100644 --- a/addons/account/report/account_partner_ledger.rml +++ b/addons/account/report/account_partner_ledger.rml @@ -274,67 +274,65 @@ - - [[ display_currency(data) == False or removeParentNode('blockTable') ]] - - - Date - - - JNRL - - - Ref - - - Account - - - Entry Label - - - Debit - - - Credit - - - Balance - - - - - [[ display_currency(data) == True or removeParentNode('blockTable') ]] - - - Date - - - JNRL - - - Ref - - - Account - - - Entry Label - - - Debit - - - Credit - - - Balance - - - Currency - - - + + + + Date + + + JNRL + + + Ref + + + Account + + + Entry Label + + + Debit + + + Credit + + + Balance + + + + + + + Date + + + JNRL + + + Ref + + + Account + + + Entry Label + + + Debit + + + Credit + + + Balance + + + Currency + + + [[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]] diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml index 358f2e7ebbe..22942e15c78 100644 --- a/addons/account/report/account_partner_ledger_other.rml +++ b/addons/account/report/account_partner_ledger_other.rml @@ -275,66 +275,66 @@ - [[ display_currency(data) == False or removeParentNode('blockTable') ]] - - - Date - - - JNRL - - - Ref - - - Account - - - Entry Label - - - Debit - - - Credit - - - Balance - - - + [[ display_currency(data) == False or removeParentNode('blockTable') ]] + + + Date + + + JNRL + + + Ref + + + Account + + + Entry Label + + + Debit + + + Credit + + + Balance + + + - [[ display_currency(data) == True or removeParentNode('blockTable') ]] - - - Date - - - JNRL - - - Ref - - - Account - - - Entry Label - - - Debit - - - Credit - - - Balance - - - Currency - - - + [[ display_currency(data) == True or removeParentNode('blockTable') ]] + + + Date + + + JNRL + + + Ref + + + Account + + + Entry Label + + + Debit + + + Credit + + + Balance + + + Currency + + + diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml index 82ad0fca034..2869471eb14 100644 --- a/addons/account/report/account_print_invoice.rml +++ b/addons/account/report/account_print_invoice.rml @@ -132,25 +132,25 @@ - + - Description + Description - Taxes + Taxes - Quantity + Quantity - Unit Price + Unit Price - Disc.(%) + Disc.(%) - Price + Price @@ -219,31 +219,31 @@ - + - Description + Description - Taxes + Taxes - Quantity + Quantity - Unit Price + Unit Price - Disc.(%) + Disc.(%) - Price + Price
[[ repeatIn(o.invoice_line,'l') ]] - + [[ l.name ]] @@ -258,7 +258,7 @@ [[ formatLang(l.price_unit) ]] - [[ formatLang(l.discount, digits=get_digits(dp='Account')) ]] + [[ formatLang(l.discount, digits=get_digits(dp='Account')) ]] [[ formatLang(l.price_subtotal, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] From 6f20dbde67101f9fe720f2aa95f5387cf97922d1 Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Wed, 15 Dec 2010 15:42:04 +0530 Subject: [PATCH 11/54] [IMP]:sale:improved sale order bzr revid: apa@tinyerp.com-20101215101204-rmorqrr2s1sohlpd --- addons/sale/report/sale_order.rml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml index 5fe9308386d..d80b07fa06f 100644 --- a/addons/sale/report/sale_order.rml +++ b/addons/sale/report/sale_order.rml @@ -128,7 +128,7 @@ - + Description @@ -143,7 +143,7 @@ Unit Price - Disc.(%) + Disc.(%) Price @@ -241,7 +241,7 @@ - + Description @@ -256,7 +256,7 @@ Unit Price - Disc.(%) + Disc.(%) Price @@ -265,7 +265,7 @@
[[repeatIn(o.order_line,'line')]] - + [[ line.name ]] @@ -274,16 +274,13 @@ [[ ', '.join(map(lambda x: x.name, line.tax_id)) ]] - [[ formatLang(line.product_uos and line.product_uos_qty or line.product_uom_qty) ]] - - - [[ line.product_uos and line.product_uos.name or line.product_uom.name ]] + [[ formatLang(line.product_uos and line.product_uos_qty or line.product_uom_qty) ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]] [[ formatLang(line.price_unit ) ]] - [[ formatLang(line.discount, digits=get_digits(dp='Sale Price')) ]] + [[ formatLang(line.discount, digits=get_digits(dp='Sale Price')) ]] [[ formatLang(line.price_subtotal, digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id.symbol ]] @@ -326,7 +323,7 @@
- + From c087787d1935531b2b5161a784c5ad4e77378137 Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Wed, 15 Dec 2010 15:55:05 +0530 Subject: [PATCH 12/54] [IMP]:purchase:improved purchase order bzr revid: apa@tinyerp.com-20101215102505-mpuu05tpp9tg4b7e --- addons/purchase/report/order.rml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index f9782edfb6d..a19fbaa0c27 100644 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -131,7 +131,7 @@ - + Description @@ -251,31 +251,31 @@ - + - Description + Description - Taxes + Taxes - Date Req. + Date Req. - Qty + Qty - Unit Price + Unit Price - Net Price + Net Price
[[repeatIn(o.order_line,'line')]] - + [[ line.name ]] @@ -284,7 +284,7 @@ [[ ', '.join(map(lambda x: x.name, line.taxes_id)) ]] - [[ formatLang( line.date_planned, date=True) ]] + [[ formatLang( line.date_planned, date=True) ]] [[ formatLang(line.product_qty ) ]] [[ line.product_uom.name ]] @@ -328,7 +328,7 @@
- + @@ -384,4 +384,4 @@ - \ No newline at end of file + From 4c41bbb80a31b513cde150102944da1ab3e05098 Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Wed, 15 Dec 2010 16:18:02 +0530 Subject: [PATCH 13/54] [IMP]:improved hr reports. bzr revid: apa@tinyerp.com-20101215104802-95pv1tz74fuj433b --- addons/hr_attendance/report/bymonth.xsl | 2 +- addons/hr_expense/report/expense.rml | 34 ++++++------------- addons/hr_timesheet/report/user_timesheet.xsl | 2 +- 3 files changed, 13 insertions(+), 25 deletions(-) diff --git a/addons/hr_attendance/report/bymonth.xsl b/addons/hr_attendance/report/bymonth.xsl index 3975e4d1d11..23e7fb14b3d 100644 --- a/addons/hr_attendance/report/bymonth.xsl +++ b/addons/hr_attendance/report/bymonth.xsl @@ -29,7 +29,7 @@ - Attendance By Month + Attendances By Month week diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml index b12971564b1..eeb9854c059 100644 --- a/addons/hr_expense/report/expense.rml +++ b/addons/hr_expense/report/expense.rml @@ -68,10 +68,8 @@ - - - - + + @@ -113,7 +111,7 @@ - + Date @@ -122,7 +120,7 @@ Name - Ref. + Ref. Unit Price @@ -131,7 +129,7 @@ Qty - Total Price + Price @@ -176,7 +174,7 @@ - + Date @@ -185,7 +183,7 @@ Name - Ref. + Ref. Unit Price @@ -194,7 +192,7 @@ Qty - Total Price + Price @@ -203,7 +201,7 @@
[[ repeatIn(o.line_ids,'line') ]] - + [[ formatLang(line.date_value,date=True) ]] @@ -256,7 +254,7 @@
- + @@ -264,17 +262,7 @@ - - - - - - - - - - - Total: + Total: [[ formatLang(o.amount) ]] [[ o.currency_id.symbol ]] diff --git a/addons/hr_timesheet/report/user_timesheet.xsl b/addons/hr_timesheet/report/user_timesheet.xsl index b4a5a8c8d25..b58e8af33b2 100644 --- a/addons/hr_timesheet/report/user_timesheet.xsl +++ b/addons/hr_timesheet/report/user_timesheet.xsl @@ -48,7 +48,7 @@ - Timesheet + Timesheet by Employee From fc707635b566ec918b4279bdabaccca89fd21c73 Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Wed, 15 Dec 2010 16:20:57 +0530 Subject: [PATCH 14/54] [IMP]:purchase report bzr revid: apa@tinyerp.com-20101215105057-050p8k7lc8hkskxj --- addons/purchase/report/order.rml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index a19fbaa0c27..c12a04b586f 100644 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -131,25 +131,25 @@ - + - Description + Description - Taxes + Taxes - Date Req. + Date Req. - Qty + Qty - Unit Price + Unit Price - Net Price + Net Price From fc2d592edf924e3bf7e1021c09d720f3a476f585 Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Thu, 16 Dec 2010 12:08:18 +0530 Subject: [PATCH 15/54] [IMP]:account:improved balance sheet report with bold net profit bzr revid: apa@tinyerp.com-20101216063818-kl063n0rw0erdvoj --- addons/account/report/account_balance_sheet.rml | 6 +++--- .../account/report/account_balance_sheet_horizontal.rml | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml index 74b3bf81190..680c7d4bb43 100644 --- a/addons/account/report/account_balance_sheet.rml +++ b/addons/account/report/account_balance_sheet.rml @@ -253,13 +253,13 @@ - [[ repeatIn(get_lines_another('liability'), 'a') ]][[ a['code'] ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] + [[ repeatIn(get_lines_another('liability'), 'a') ]][[ a['code'] ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] [[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]] - [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]] + [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]][[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]] - [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]] + [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]][[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]] diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml index d29ee5abffd..f9942c41b95 100644 --- a/addons/account/report/account_balance_sheet_horizontal.rml +++ b/addons/account/report/account_balance_sheet_horizontal.rml @@ -205,13 +205,15 @@ [[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]] - [[ repeatIn(get_lines(), 'a') ]] [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['code'] ]] + [[ repeatIn(get_lines(), 'a') ]] [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['code'] ]][[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]] - [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]] + [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]][[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]] - [[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[(a['code'] and a['name']) and formatLang(abs(a['balance'])) or removeParentNode('font')]] [[ company.currency_id.symbol ]] + [[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]] +[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]] + [[(a['code'] and a['name']) and formatLang(abs(a['balance'])) or removeParentNode('font')]] [[ company.currency_id.symbol ]] From c4c9acb7e1da4782e98de5264b93d23a41608402 Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Thu, 16 Dec 2010 12:23:46 +0530 Subject: [PATCH 16/54] [IMP]:account:improved general ledger landscape report bzr revid: apa@tinyerp.com-20101216065346-cccpxsgpdt1lkly3 --- .../account_general_ledger_landscape.rml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index 49346335957..86f5d28ae76 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -263,11 +263,11 @@ - + - + @@ -496,19 +496,19 @@ [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] - [[ '..'*(o.level-1) ]][[ o.code ]] [[ o.name ]] + [[ '..'*(o.level-1) ]][[ o.code ]] [[ o.name ]] - [[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]] + [[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]] - [[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]] + [[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]] - [[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + [[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] - [[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]] + [[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]] @@ -526,7 +526,7 @@ [[ line['lcode'] ]] - [[ strip_name(line['partner_name'],21) ]] + [[ strip_name(line['partner_name'],20) ]] [[ strip_name(line['lref'],17) ]] @@ -535,7 +535,7 @@ [[ line['move'] ]] - [[ strip_name(line['lname'],26) ]] + [[ strip_name(line['lname'],24) ]] [[ strip_name(line['line_corresp'],18) ]] @@ -598,16 +598,16 @@ [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] - [[ '..'*(o.level-1) ]][[ o.code ]] [[ o.name ]] + [[ '..'*(o.level-1) ]][[ o.code ]] [[ o.name ]] - [[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]] + [[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]] - [[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]] + [[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]] - [[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + [[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] @@ -625,7 +625,7 @@ [[ line['lcode'] ]] - [[ strip_name(line['partner_name'],25) ]] + [[ strip_name(line['partner_name'],24) ]] [[ strip_name(line['lref'],21) ]] @@ -634,7 +634,7 @@ [[ line['move'] ]] - [[ strip_name(line['lname'],35) ]] + [[ strip_name(line['lname'],32) ]] [[ strip_name(line['line_corresp'],23) ]] From 0731a686ce0f6ff4427d06f4083d49ba2aff1b90 Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Thu, 16 Dec 2010 12:33:24 +0530 Subject: [PATCH 17/54] [IMP]:account:improvedventral journal bzr revid: apa@tinyerp.com-20101216070324-qkb0dchjbnbaeq4c --- addons/account/report/account_central_journal.rml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml index 320a38370a2..33566083652 100644 --- a/addons/account/report/account_central_journal.rml +++ b/addons/account/report/account_central_journal.rml @@ -233,7 +233,7 @@ - + [[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]] [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] @@ -274,7 +274,7 @@ - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] A/C No. Account Name @@ -293,7 +293,7 @@ Currency - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] Total: @@ -314,7 +314,7 @@
[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]] - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] [[ line['code'] ]] [[ line['name'] ]] From 148cd7d889e6d7178e918262e8a58ad6b9d7276f Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Thu, 16 Dec 2010 12:36:08 +0530 Subject: [PATCH 18/54] [IMP]:account:improved crossovered report bzr revid: apa@tinyerp.com-20101216070608-rqwxno4a0k4ii9xy --- .../account_analytic_plans/report/crossovered_analytic.rml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/account_analytic_plans/report/crossovered_analytic.rml b/addons/account_analytic_plans/report/crossovered_analytic.rml index 0292522206d..6e331ed1b83 100644 --- a/addons/account_analytic_plans/report/crossovered_analytic.rml +++ b/addons/account_analytic_plans/report/crossovered_analytic.rml @@ -150,7 +150,7 @@ Amount - Percentage + Perc(%) @@ -222,7 +222,7 @@ Amount - Percentage + Perc(%) @@ -301,4 +301,4 @@
- \ No newline at end of file + From aa16ff6aae9eae4e5bd806f03875acf641ea72b1 Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Thu, 16 Dec 2010 12:39:43 +0530 Subject: [PATCH 19/54] [IMP]:lunch:improved order report bzr revid: apa@tinyerp.com-20101216070943-t4lfdex6923ubegp --- addons/lunch/report/order.rml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml index 05a1b69c446..5bd5beafc15 100644 --- a/addons/lunch/report/order.rml +++ b/addons/lunch/report/order.rml @@ -164,7 +164,7 @@
- + @@ -184,4 +184,4 @@ - \ No newline at end of file + From ce252363d419644bd21fa459a6b01eedda2cbe47 Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Thu, 16 Dec 2010 13:07:48 +0530 Subject: [PATCH 20/54] [IMP]:mrp:product cost structure bzr revid: apa@tinyerp.com-20101216073748-f0l6nciza2u3yd1y --- addons/mrp/report/price.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py index 53063bd7ad6..76bcc4b92da 100644 --- a/addons/mrp/report/price.py +++ b/addons/mrp/report/price.py @@ -129,7 +129,7 @@ class report_custom(report_rml): %s %s - """ % (_('Component'), _('Component suppliers'), _('Quantity'),_('Cost Price per Uom'), _('Supplier Price per Uom')) + """ % (_('Components'), _('Components suppliers'), _('Quantity'),_('Cost Price per Uom'), _('Supplier Price per Uom')) purchase_price_digits = rml_obj.get_digits(dp='Purchase Price') @@ -176,7 +176,7 @@ class report_custom(report_rml): xml += "" + xml_tmp + '' xml += """ - """ + _('Component Cost of ') + str(number) +' '+ product.uom_id.name + """: + """ + _('Components Cost of ') + str(number) +' '+ product.uom_id.name + """: """+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """ From f8d0c8391064414cff719cf2736e07c0439a97c7 Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Thu, 16 Dec 2010 13:59:11 +0530 Subject: [PATCH 21/54] [IMP]:point_of_sale:improved sale line report. bzr revid: apa@tinyerp.com-20101216082911-l3fcjidr2celxqgh --- addons/point_of_sale/report/pos_lines.rml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml index b0a2e606897..22ff18e0231 100644 --- a/addons/point_of_sale/report/pos_lines.rml +++ b/addons/point_of_sale/report/pos_lines.rml @@ -199,7 +199,7 @@ - Net Total + Net Total : [[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]] @@ -212,7 +212,7 @@ - Taxes + Taxes : [[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]] @@ -236,4 +236,4 @@ - \ No newline at end of file + From 620ba23f3606d71bbce30027aa8d95697ffa68c5 Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Thu, 16 Dec 2010 15:02:34 +0530 Subject: [PATCH 22/54] [FIX]:changed the wizard menu_id with datas ID for multiheader problem. bzr revid: apa@tinyerp.com-20101216093234-xsqxxube70cmj7fm --- addons/hr_payroll/wizard/hr_payroll_employees_detail.py | 4 ++-- addons/hr_payroll/wizard/hr_payroll_year_salary.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py index 2bb36b6f282..7a4c9ff406d 100755 --- a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py +++ b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py @@ -59,10 +59,10 @@ class hr_payroll_employees_detail(osv.osv_memory): if context is None: context = {} datas = {'ids': context.get('active_ids', [])} - res = self.read(cr, uid, ids, ['employee_ids', 'date_from', 'date_to'], context=context) res = res and res[0] or {} datas['form'] = res + datas['ids'] = res['employee_ids'] return { 'type': 'ir.actions.report.xml', 'report_name': 'employees.salary', @@ -71,4 +71,4 @@ class hr_payroll_employees_detail(osv.osv_memory): hr_payroll_employees_detail() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_payroll/wizard/hr_payroll_year_salary.py b/addons/hr_payroll/wizard/hr_payroll_year_salary.py index 41caf5f4109..186ee27be2b 100755 --- a/addons/hr_payroll/wizard/hr_payroll_year_salary.py +++ b/addons/hr_payroll/wizard/hr_payroll_year_salary.py @@ -64,6 +64,7 @@ class hr_payroll_year_salary(osv.osv_memory): res = self.read(cr, uid, ids, ['employee_ids', 'date_from', 'date_to', 'salary_on'], context=context) res = res and res[0] or {} datas['form'] = res + datas['ids'] = res['employee_ids'] return { 'type': 'ir.actions.report.xml', 'report_name': 'year.salary', @@ -72,4 +73,4 @@ class hr_payroll_year_salary(osv.osv_memory): hr_payroll_year_salary() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 46b6f82a19442bc3c14eed9a042429dee75c3840 Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Thu, 16 Dec 2010 15:42:47 +0530 Subject: [PATCH 23/54] [IMP]:delivery:remove error print statement from report. bzr revid: apa@tinyerp.com-20101216101247-08zps3g8bo80rqwu --- addons/delivery/report/shipping.rml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/delivery/report/shipping.rml b/addons/delivery/report/shipping.rml index 42fcd71a693..563c3bda826 100644 --- a/addons/delivery/report/shipping.rml +++ b/addons/delivery/report/shipping.rml @@ -125,7 +125,7 @@ - [[ (not(o.sale_id) and o.type== 'out') and 'Error, no sale order attached to this picking !' or removeParentNode('para') ]] + @@ -226,4 +226,4 @@ - \ No newline at end of file + From 9f96f2b600140375c8cf71fb75a5cee1a6fe16eb Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Thu, 16 Dec 2010 15:56:24 +0530 Subject: [PATCH 24/54] [IMP]:account_payment:used currency code instead of symbol. bzr revid: apa@tinyerp.com-20101216102624-6x15votb208f1w9w --- addons/account_payment/report/order.rml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml index e47691f54d7..9198b12db25 100644 --- a/addons/account_payment/report/order.rml +++ b/addons/account_payment/report/order.rml @@ -210,7 +210,7 @@ [[ o.date_prefered == 'fixed' and 'Fixed date' or removeParentNode('para') ]] - [[ get_company_currency() ]] + [[ o.user_id and o.user_id.company_id and o.user_id.company_id.currency_id and o.user_id.company_id.currency_id.name or '' ]] @@ -287,4 +287,4 @@ - \ No newline at end of file + From 21ab4c87d1a7836b25065b91d508a597cbf307e8 Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Thu, 16 Dec 2010 16:22:23 +0530 Subject: [PATCH 25/54] [IMP]: [FIX]:changed the wizard menu_id with datas ID for multiheader problem. bzr revid: apa@tinyerp.com-20101216105223-rwr3uvddflranbn3 --- addons/account/wizard/account_report_aged_partner_balance.py | 2 +- addons/hr_payroll/wizard/hr_payroll_employees_detail.py | 2 +- addons/hr_payroll/wizard/hr_payroll_year_salary.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py index 5eb1f0f5a2e..4abd8ea469d 100644 --- a/addons/account/wizard/account_report_aged_partner_balance.py +++ b/addons/account/wizard/account_report_aged_partner_balance.py @@ -89,7 +89,7 @@ class account_aged_trial_balance(osv.osv_memory): } start = stop + relativedelta(days=1) data['form'].update(res) - + if data.get('form',False):data['ids']=[data['form'].get('chart_account_id',False)] return { 'type': 'ir.actions.report.xml', 'report_name': 'account.aged_trial_balance', diff --git a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py index 7a4c9ff406d..2cb14a53f82 100755 --- a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py +++ b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py @@ -62,7 +62,7 @@ class hr_payroll_employees_detail(osv.osv_memory): res = self.read(cr, uid, ids, ['employee_ids', 'date_from', 'date_to'], context=context) res = res and res[0] or {} datas['form'] = res - datas['ids'] = res['employee_ids'] + datas['ids'] = res.get('employee_ids',[]) return { 'type': 'ir.actions.report.xml', 'report_name': 'employees.salary', diff --git a/addons/hr_payroll/wizard/hr_payroll_year_salary.py b/addons/hr_payroll/wizard/hr_payroll_year_salary.py index 186ee27be2b..cb7d73b6394 100755 --- a/addons/hr_payroll/wizard/hr_payroll_year_salary.py +++ b/addons/hr_payroll/wizard/hr_payroll_year_salary.py @@ -64,7 +64,7 @@ class hr_payroll_year_salary(osv.osv_memory): res = self.read(cr, uid, ids, ['employee_ids', 'date_from', 'date_to', 'salary_on'], context=context) res = res and res[0] or {} datas['form'] = res - datas['ids'] = res['employee_ids'] + datas['ids'] = res.get('employee_ids',[]) return { 'type': 'ir.actions.report.xml', 'report_name': 'year.salary', From e2048e121373476bad50d16000ea4f1d379994e6 Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Thu, 16 Dec 2010 17:29:08 +0530 Subject: [PATCH 26/54] [IMP]:point_of_sale:used currency code instead of symbol. bzr revid: apa@tinyerp.com-20101216115908-av57eo8i8li7prlo --- addons/point_of_sale/wizard/pos_details.py | 1 + addons/point_of_sale/wizard/pos_payment_report_date.py | 2 +- addons/point_of_sale/wizard/pos_sales_user_today.py | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/point_of_sale/wizard/pos_details.py b/addons/point_of_sale/wizard/pos_details.py index 8a63ae97dbd..9f0c5e7dc6e 100644 --- a/addons/point_of_sale/wizard/pos_details.py +++ b/addons/point_of_sale/wizard/pos_details.py @@ -51,6 +51,7 @@ class pos_details(osv.osv_memory): res = self.read(cr, uid, ids, ['date_start', 'date_end'], context=context) res = res and res[0] or {} datas['form'] = res + if res.get('id',False):datas['ids']=[res['id']] return { 'type': 'ir.actions.report.xml', 'report_name': 'pos.details', diff --git a/addons/point_of_sale/wizard/pos_payment_report_date.py b/addons/point_of_sale/wizard/pos_payment_report_date.py index 49e21c01c05..b05ae7b575c 100644 --- a/addons/point_of_sale/wizard/pos_payment_report_date.py +++ b/addons/point_of_sale/wizard/pos_payment_report_date.py @@ -44,7 +44,7 @@ class pos_payment_report_date(osv.osv_memory): res = self.read(cr, uid, ids, ['date_start', 'date_end', 'user_id'], context=context) res = res and res[0] or {} datas['form'] = res - + if res.get('id',False):datas['ids']=[res['id']] return { 'type': 'ir.actions.report.xml', 'report_name': 'pos.payment.report.date', diff --git a/addons/point_of_sale/wizard/pos_sales_user_today.py b/addons/point_of_sale/wizard/pos_sales_user_today.py index 33c9dc8f3fc..d9dbc82d294 100644 --- a/addons/point_of_sale/wizard/pos_sales_user_today.py +++ b/addons/point_of_sale/wizard/pos_sales_user_today.py @@ -47,7 +47,6 @@ class pos_sales_user_today(osv.osv_memory): res = self.read(cr, uid, ids, ['user_id'], context=context) res = res and res[0] or {} datas['form'] = res - return { 'type': 'ir.actions.report.xml', 'report_name': 'pos.sales.user.today', From 026db4241a462dd5f2de2f9f5e1ced7781784f80 Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Thu, 16 Dec 2010 18:59:56 +0530 Subject: [PATCH 27/54] [IMP]:project_planning:improved planning report bzr revid: apa@tinyerp.com-20101216132956-aua2mycfp096g5sf --- .../report/report_planning.rml | 226 +++++++++--------- 1 file changed, 115 insertions(+), 111 deletions(-) diff --git a/addons/project_planning/report/report_planning.rml b/addons/project_planning/report/report_planning.rml index 43dab8eb5b4..7d46de5e025 100644 --- a/addons/project_planning/report/report_planning.rml +++ b/addons/project_planning/report/report_planning.rml @@ -1,8 +1,8 @@ - -