From 1154c4c65f523d6a0906f06304af0c3615b5be3b Mon Sep 17 00:00:00 2001 From: "Apa (Open ERP)" Date: Sat, 24 Jan 2009 11:28:50 +0530 Subject: [PATCH 1/4] set formatLang function in production report bzr revid: apa@tinyerp.com-20090124055850-yayo3jjnykatp1rs --- addons/mrp/report/order.rml | 217 +++++++++++++++++------------------- 1 file changed, 104 insertions(+), 113 deletions(-) diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml index 0209da707ac..cf803fef7b9 100644 --- a/addons/mrp/report/order.rml +++ b/addons/mrp/report/order.rml @@ -118,47 +118,25 @@ - + - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -167,185 +145,198 @@ + + + + + + + + + + + + + + + + + + + + + + - [[ repeatIn(objects,'o') ]] - + [[ repeatIn(objects,'o') ]] + - + - + - Production Order N° : [[ o.name ]] - + Production Order N° : [[ o.name ]] + - Product + Product - Quantity + Quantity - Priority + Priority - Note + Note - [[ '['+ o.product_id.code +']' ]] [[ o.product_id.name ]] + [[ o.product_id.code ]] [[ o.product_id.name ]] - [[ formatLang(o.product_qty) ]] + [[formatLang(o.product_qty) ]] - [[o.priority or '']] + [[o.priority or '']] - [[ o.product_id.description or '' ]] + [[ o.product_id.description or '' ]] - + - + - Printing date + Printing date - Planned Date + Planned Date - Partner Ref + Partner Ref - SO Number + SO Number
- + - [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] + [[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]] - [[ formatLang(o.date_planned, date=True) ]] + [[ formatLang(o.date_planned, date_time = True) ]] - [[ o.sale_ref or ' ' ]] + [[ o.sale_ref or ' ' ]] - [[ o.sale_name or '' ]] + [[ o.sale_name or '' ]]
- + - Work Orders - - - - + Work Orders + - Sequence + Sequence - Name + Name - WorkCenter + WorkCenter - No. Of Cycles + No. Of Cycles - No. Of Hours + No. Of Hours - + - [[ repeatIn(o.workcenter_lines,'line2') ]] - [[ line2.sequence ]] + [[ repeatIn(o.workcenter_lines,'line2') ]] + [[ line2.sequence ]] - [[ line2.name ]] + [[ line2.name ]] - [[ line2.workcenter_id.name ]] + [[ line2.workcenter_id.name ]] - [[ formatLang(line2.cycle) ]] + [[ formatLang(line2.cycle) ]] - [[ formatLang(line2.hour) ]] + [[ formatLang(line2.hour) ]] - + - Bill Of Material - - - - + Bill Of Material + - Product + Product - Qty + Qty - Source Location + Source Location - Destination Location - - - - - [[ repeatIn(o.move_lines,'line') ]] - [[ '['+line.product_id.code +']' ]][[ line.product_id.name ]] - - - [[ formatLang(line.product_qty) ]] [[line.product_uom.name]] - - - [[ line.location_id.name ]] - - - [[ line.location_dest_id.name ]] + Destination Location - - ......... - ......... - - - - - - - +
+ [[ repeatIn(o.move_lines,'line') ]] + + + + [[ line.product_id.code ]] [[ line.product_id.name ]] + + + [[ formatLang( line.product_qty) ]] [[line.product_uom.name]] + + + [[ line.location_id.name ]] + + + [[ line.location_dest_id.name ]] + + + + + + +
From 0b16be4a830126d3f3b57b20a32bc30a6dbee189 Mon Sep 17 00:00:00 2001 From: "Apa (Open ERP)" Date: Sat, 24 Jan 2009 11:39:28 +0530 Subject: [PATCH 2/4] it s still not ok for report central journal...need to put it in the middle to be more beautiful bzr revid: apa@tinyerp.com-20090124060928-up58mktdma1wv08e --- addons/account/report/central_journal.rml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/account/report/central_journal.rml b/addons/account/report/central_journal.rml index 8ebc61c86e1..d8f78bce8cb 100644 --- a/addons/account/report/central_journal.rml +++ b/addons/account/report/central_journal.rml @@ -115,16 +115,18 @@ [[ repeatIn(objects, 'o') ]] - - [[ company.name ]] - - Central Journal-[[ company.currency_id.name ]] + Central Journal + + + + + From 888e99857b4da2517a1ce95e47eb7e9effeffe54 Mon Sep 17 00:00:00 2001 From: "Apa (Open ERP)" Date: Sat, 24 Jan 2009 13:13:11 +0530 Subject: [PATCH 3/4] set formatLang function for header/footer date in account report bzr revid: apa@tinyerp.com-20090124074311-33ibntguf7a48pfm --- addons/account/report/account_balance.rml | 2 +- addons/account/report/account_journal.rml | 2 +- addons/account/report/account_tax_code.rml | 2 +- addons/account/report/aged_trial_balance.rml | 2 +- addons/account/report/general_journal.py | 2 +- addons/account/report/general_journal.rml | 12 +++++++----- addons/account/report/general_ledger.rml | 2 +- addons/account/report/general_ledger_landscape.rml | 2 +- addons/account/report/partner_balance.rml | 2 +- addons/account/report/tax_report.rml | 2 +- addons/account/report/third_party_ledger.rml | 2 +- 11 files changed, 17 insertions(+), 15 deletions(-) diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index e63ab030380..64f448cbfba 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -13,7 +13,7 @@ - [[ time.strftime("%m-%d-%y %H:%M", time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index 66bee0571e7..9e782e5bce3 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -24,7 +24,7 @@ - [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page diff --git a/addons/account/report/account_tax_code.rml b/addons/account/report/account_tax_code.rml index 2a4a6bbe292..72bbf56c9e9 100644 --- a/addons/account/report/account_tax_code.rml +++ b/addons/account/report/account_tax_code.rml @@ -16,7 +16,7 @@ - [[ time.strftime("%m-%d-%Y %H:%M", time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page diff --git a/addons/account/report/aged_trial_balance.rml b/addons/account/report/aged_trial_balance.rml index d3658c684c4..e566cb4a26d 100644 --- a/addons/account/report/aged_trial_balance.rml +++ b/addons/account/report/aged_trial_balance.rml @@ -21,7 +21,7 @@ - [[ time.strftime('%Y-%m-%d %H:%M', time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page diff --git a/addons/account/report/general_journal.py b/addons/account/report/general_journal.py index b61e09c9031..9aa8b45aa10 100644 --- a/addons/account/report/general_journal.py +++ b/addons/account/report/general_journal.py @@ -123,7 +123,7 @@ class journal_print(report_sxw.rml_parse): return 0.0 self.cr.execute('select sum(credit) from account_move_line where period_id in (' + self.period_ids + ') and journal_id in (' + self.journal_ids + ') and state<>\'draft\'') return self.cr.fetchone()[0] or 0.0 -report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml',parser=journal_print, header=False) +report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml',parser=journal_print) report_sxw.report_sxw('report.account.general.journal.wiz', 'account.journal.period', 'addons/account/report/wizard_general_journal.rml',parser=journal_print, header=False) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/general_journal.rml b/addons/account/report/general_journal.rml index 365967e47e5..5a9ccff4213 100644 --- a/addons/account/report/general_journal.rml +++ b/addons/account/report/general_journal.rml @@ -93,18 +93,20 @@ - + - - [[ company.name ]] - - General Journal - [[ company.currency_id.name ]] + General Journal + + + + + diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml index c2a5fc7828b..09c071f4d6e 100644 --- a/addons/account/report/general_ledger.rml +++ b/addons/account/report/general_ledger.rml @@ -20,7 +20,7 @@ - [[ time.strftime("%d-%m-%Y %H:%M", time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml index 51593eacf05..c7f955516bb 100644 --- a/addons/account/report/general_ledger_landscape.rml +++ b/addons/account/report/general_ledger_landscape.rml @@ -20,7 +20,7 @@ - [[ time.strftime("%d-%m-%Y %H:%M", time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page diff --git a/addons/account/report/partner_balance.rml b/addons/account/report/partner_balance.rml index 55947fa5654..a096b5a2412 100644 --- a/addons/account/report/partner_balance.rml +++ b/addons/account/report/partner_balance.rml @@ -24,7 +24,7 @@ - [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page diff --git a/addons/account/report/tax_report.rml b/addons/account/report/tax_report.rml index aa2f25bc85f..1f17874129a 100644 --- a/addons/account/report/tax_report.rml +++ b/addons/account/report/tax_report.rml @@ -20,7 +20,7 @@ - [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page diff --git a/addons/account/report/third_party_ledger.rml b/addons/account/report/third_party_ledger.rml index d4cfd537bd8..91a9b67d7ca 100644 --- a/addons/account/report/third_party_ledger.rml +++ b/addons/account/report/third_party_ledger.rml @@ -24,7 +24,7 @@ - [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]] + [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]] Page From ac6553a7a29d3cf9745ac438be3a029308757109 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Sat, 24 Jan 2009 11:04:52 +0100 Subject: [PATCH 4/4] [FIX] hr_hollidays - Security lp bug: https://launchpad.net/bugs/320754 fixed bzr revid: stephane@tinyerp.com-20090124100452-6w3eaqytozz9zrbm --- addons/hr_holidays/security/ir.model.access.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv index 77d0bc559cd..5af36ab580e 100644 --- a/addons/hr_holidays/security/ir.model.access.csv +++ b/addons/hr_holidays/security/ir.model.access.csv @@ -1,5 +1,5 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_hr_holidays_log","hr.holidays.log","model_hr_holidays_log_access","hr.group_hr_user",1,1,1,1 +"access_hr_holidays_log","hr.holidays.log","model_hr_holidays_log","hr.group_hr_user",1,1,1,1 "access_hr_holidays_per_user","hr.holidays.per.user","model_hr_holidays_per_user","hr.group_hr_user",1,1,1,1 "access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","hr.group_hr_user",1,1,1,1 "access_hr_holidays_user","hr holidays user","model_hr_holidays","hr.group_hr_user",1,1,1,1