diff --git a/addons/account/report/general_journal.py b/addons/account/report/general_journal.py
index c5773bb69f6..044a97d9c8b 100644
--- a/addons/account/report/general_journal.py
+++ b/addons/account/report/general_journal.py
@@ -116,7 +116,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
def _get_currency(self, data):
if data['model']=='account.journal.period':
- return self.pool.get('account.journal.period').browse(self.cr, self.uid, data['id']).journal_id.currency or False
+ return True
return data['form']['amount_currency']
report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml', parser=journal_print, header='internal')
diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml
index a01698aa9ee..b8c34128e6b 100644
--- a/addons/account/report/general_ledger.rml
+++ b/addons/account/report/general_ledger.rml
@@ -4,30 +4,7 @@
-
-
-
-
-
-
-
-
-
-
- [[ company.name ]]
- General Ledger - [[ company.currency_id.name ]]
-
-
-
- [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]
- Page
-
-
-
-
- 0.88cm 27.7cm 20.12cm 27.7cm
-
@@ -226,7 +203,7 @@
Fiscal Year |
Journals |
Display Account |
- Filters By [[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]][[ get_filter(data) ]] |
+ Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] |
Entries Sorted By |
Printing Date |
diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml
index 0e276683e6c..a52d8df8cfd 100644
--- a/addons/account/report/general_ledger_landscape.rml
+++ b/addons/account/report/general_ledger_landscape.rml
@@ -4,31 +4,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]
- Page
-
-
-
-
-
- 1.3cm 24.9cm 38.3cm 24.9cm
-
+
@@ -235,7 +211,7 @@
Fiscal Year |
Journals |
Display Account |
- Filters By [[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]][[ get_filter(data) ]] |
+ Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] |
Entries Sorted By |
Printing Date |
diff --git a/addons/account/report/report_bs.py b/addons/account/report/report_bs.py
index 0ee39af203c..5e4c2838ec9 100644
--- a/addons/account/report/report_bs.py
+++ b/addons/account/report/report_bs.py
@@ -216,8 +216,8 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
report_sxw.report_sxw('report.account.balancesheet.horizontal', 'account.account',
'addons/account/report/report_balance_sheet_horizontal.rml',parser=report_balancesheet_horizontal,
- header=False)
+ header='internal')
report_sxw.report_sxw('report.account.balancesheet', 'account.account',
'addons/account/report/report_balance_sheet.rml',parser=report_balancesheet_horizontal,
- header=False)
+ header='internal')
diff --git a/addons/account/report/report_pl_account_horizontal.rml b/addons/account/report/report_pl_account_horizontal.rml
index 24d1e8c55e5..c15eea3b881 100644
--- a/addons/account/report/report_pl_account_horizontal.rml
+++ b/addons/account/report/report_pl_account_horizontal.rml
@@ -3,19 +3,7 @@
-
-
-
- [[ get_company(data['form']) ]]
-
-
- [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]
- Page
-
-
- 1.3cm 24.9cm 38.3cm 24.9cm
-
-
+