diff --git a/account_financial_report/report/aged_partner_balance.py b/account_financial_report/report/aged_partner_balance.py
index a00d32ee..21d330fb 100644
--- a/account_financial_report/report/aged_partner_balance.py
+++ b/account_financial_report/report/aged_partner_balance.py
@@ -189,6 +189,9 @@ class AgedPartnerBalanceReportCompute(models.TransientModel):
self.ensure_one()
if report_type == 'xlsx':
report_name = 'a_f_r.report_aged_partner_balance_xlsx'
+ elif report_type == 'qweb-html':
+ report_name = 'account_financial_report.' \
+ 'report_aged_partner_balance_html_qweb'
else:
report_name = 'account_financial_report.' \
'report_aged_partner_balance_qweb'
diff --git a/account_financial_report/report/general_ledger.py b/account_financial_report/report/general_ledger.py
index db6512f3..5af9f600 100644
--- a/account_financial_report/report/general_ledger.py
+++ b/account_financial_report/report/general_ledger.py
@@ -219,6 +219,9 @@ class GeneralLedgerReportCompute(models.TransientModel):
self.ensure_one()
if report_type == 'xlsx':
report_name = 'a_f_r.report_general_ledger_xlsx'
+ elif report_type == 'qweb-html':
+ report_name = 'account_financial_report.' \
+ 'report_general_ledger_html_qweb'
else:
report_name = 'account_financial_report.' \
'report_general_ledger_qweb'
@@ -1224,7 +1227,7 @@ LEFT JOIN
account_analytic_account aa ON ml.analytic_account_id = aa.id
"""
if self.filter_analytic_tag_ids:
- query_inject_move_line += """
+ query_inject_move_line += """
INNER JOIN
move_lines_on_tags ON ml.id = move_lines_on_tags.ml_id
"""
diff --git a/account_financial_report/report/journal_ledger.py b/account_financial_report/report/journal_ledger.py
index b72ce5bf..b8c9117d 100644
--- a/account_financial_report/report/journal_ledger.py
+++ b/account_financial_report/report/journal_ledger.py
@@ -589,6 +589,9 @@ class ReportJournalLedger(models.TransientModel):
self.ensure_one()
if report_type == 'xlsx':
report_name = 'a_f_r.report_journal_ledger_xlsx'
+ elif report_type == 'qweb-html':
+ report_name = 'account_financial_report.' \
+ 'report_journal_ledger_html_qweb'
else:
report_name = 'account_financial_report.' \
'report_journal_ledger_qweb'
diff --git a/account_financial_report/report/open_items.py b/account_financial_report/report/open_items.py
index f1039151..05d5e4a0 100644
--- a/account_financial_report/report/open_items.py
+++ b/account_financial_report/report/open_items.py
@@ -155,6 +155,9 @@ class OpenItemsReportCompute(models.TransientModel):
self.ensure_one()
if report_type == 'xlsx':
report_name = 'a_f_r.report_open_items_xlsx'
+ elif report_type == 'qweb-html':
+ report_name = 'account_financial_report.' \
+ 'report_open_items_html_qweb'
else:
report_name = 'account_financial_report.' \
'report_open_items_qweb'
diff --git a/account_financial_report/report/templates/aged_partner_balance.xml b/account_financial_report/report/templates/aged_partner_balance.xml
index d6816058..f8b3cc7d 100644
--- a/account_financial_report/report/templates/aged_partner_balance.xml
+++ b/account_financial_report/report/templates/aged_partner_balance.xml
@@ -11,6 +11,10 @@
+
+
+
+
diff --git a/account_financial_report/report/templates/general_ledger.xml b/account_financial_report/report/templates/general_ledger.xml
index 3aa980a5..58a502a3 100644
--- a/account_financial_report/report/templates/general_ledger.xml
+++ b/account_financial_report/report/templates/general_ledger.xml
@@ -11,6 +11,10 @@
+
+
+
+
diff --git a/account_financial_report/report/templates/journal_ledger.xml b/account_financial_report/report/templates/journal_ledger.xml
index 8d04fb35..13a1eba6 100644
--- a/account_financial_report/report/templates/journal_ledger.xml
+++ b/account_financial_report/report/templates/journal_ledger.xml
@@ -11,6 +11,10 @@
+
+
+
+
diff --git a/account_financial_report/report/templates/open_items.xml b/account_financial_report/report/templates/open_items.xml
index 193c2d73..f0b22a1b 100644
--- a/account_financial_report/report/templates/open_items.xml
+++ b/account_financial_report/report/templates/open_items.xml
@@ -11,6 +11,10 @@
+
+
+
+
diff --git a/account_financial_report/report/templates/trial_balance.xml b/account_financial_report/report/templates/trial_balance.xml
index 869ba9e3..fea0f7f8 100644
--- a/account_financial_report/report/templates/trial_balance.xml
+++ b/account_financial_report/report/templates/trial_balance.xml
@@ -11,6 +11,10 @@
+
+
+
+
diff --git a/account_financial_report/report/trial_balance.py b/account_financial_report/report/trial_balance.py
index c668127a..5e8029e9 100644
--- a/account_financial_report/report/trial_balance.py
+++ b/account_financial_report/report/trial_balance.py
@@ -204,6 +204,9 @@ class TrialBalanceReportCompute(models.TransientModel):
self.ensure_one()
if report_type == 'xlsx':
report_name = 'a_f_r.report_trial_balance_xlsx'
+ elif report_type == 'qweb-html':
+ report_name = 'account_financial_report.' \
+ 'report_trial_balance_html_qweb'
else:
report_name = 'account_financial_report.' \
'report_trial_balance_qweb'
diff --git a/account_financial_report/reports.xml b/account_financial_report/reports.xml
index cce1432c..e9b05ebd 100644
--- a/account_financial_report/reports.xml
+++ b/account_financial_report/reports.xml
@@ -17,10 +17,10 @@
model="report_general_ledger"
string="General Ledger"
report_type="qweb-html"
- name="account_financial_report.report_general_ledger_qweb"
+ name="account_financial_report.report_general_ledger_html_qweb"
file="account_financial_report.report_general_ledger_html"
/>
-
+
@@ -53,7 +53,7 @@
model="report_trial_balance"
string="Trial Balance"
report_type="qweb-html"
- name="account_financial_report.report_trial_balance_qweb"
+ name="account_financial_report.report_trial_balance_html_qweb"
file="account_financial_report.report_trial_balance_html"
/>
@@ -71,7 +71,7 @@
model="report_open_items"
string="Open Items"
report_type="qweb-html"
- name="account_financial_report.report_open_items_qweb"
+ name="account_financial_report.report_open_items_html_qweb"
file="account_financial_report.report_open_items_html"
/>
@@ -89,7 +89,7 @@
model="report_aged_partner_balance"
string="Aged Partner Balance"
report_type="qweb-html"
- name="account_financial_report.report_aged_partner_balance_qweb"
+ name="account_financial_report.report_aged_partner_balance_html_qweb"
file="account_financial_report.report_aged_partner_balance_html"
/>
@@ -110,7 +110,7 @@
name="account_financial_report.report_vat_report_qweb"
file="account_financial_report.report_vat_report_html"
/>
-
+
@@ -145,7 +145,7 @@
model="ir.actions.report">
-
+
@@ -197,7 +197,7 @@
xlsx
report_aged_partner_balance
-
+
VAT Report XLSX
report_vat_report
diff --git a/account_financial_report/tests/abstract_test.py b/account_financial_report/tests/abstract_test.py
index 5935a59f..66a80f61 100644
--- a/account_financial_report/tests/abstract_test.py
+++ b/account_financial_report/tests/abstract_test.py
@@ -213,6 +213,7 @@ class AbstractTest(common.TransactionCase):
self.model = self._getReportModel()
self.qweb_report_name = self._getQwebReportName()
+ self.html_report_name = self._getHtmlReportName()
self.xlsx_report_name = self._getXlsxReportName()
self.xlsx_action_name = self._getXlsxReportActionName()
@@ -226,7 +227,7 @@ class AbstractTest(common.TransactionCase):
def test_html(self):
test_reports.try_report(self.env.cr, self.env.uid,
- self.qweb_report_name,
+ self.html_report_name,
[self.report.id],
report_type='qweb-html')
@@ -255,7 +256,7 @@ class AbstractTest(common.TransactionCase):
self.assertDictContainsSubset(
{
'type': 'ir.actions.report',
- 'report_name': self.qweb_report_name,
+ 'report_name': self.html_report_name,
'report_type': 'qweb-html',
},
report_action
@@ -263,7 +264,7 @@ class AbstractTest(common.TransactionCase):
# Check if report template is correct
report = self.env['ir.actions.report'].search(
- [('report_name', '=', self.qweb_report_name),
+ [('report_name', '=', self.html_report_name),
('report_type', '=', report_type)], limit=1)
self.assertEqual(report.report_type, 'qweb-html')
@@ -377,6 +378,12 @@ class AbstractTest(common.TransactionCase):
"""
raise NotImplementedError()
+ def _getHtmlReportName(self):
+ """
+ :return: the html report name
+ """
+ raise NotImplementedError()
+
def _getXlsxReportName(self):
"""
:return: the xlsx report name
diff --git a/account_financial_report/tests/test_aged_partner_balance.py b/account_financial_report/tests/test_aged_partner_balance.py
index 54bb7407..5dbf895f 100644
--- a/account_financial_report/tests/test_aged_partner_balance.py
+++ b/account_financial_report/tests/test_aged_partner_balance.py
@@ -17,6 +17,9 @@ class TestAgedPartnerBalance(abstract_test.AbstractTest):
def _getQwebReportName(self):
return 'account_financial_report.report_aged_partner_balance_qweb'
+ def _getHtmlReportName(self):
+ return 'account_financial_report.report_aged_partner_balance_html_qweb'
+
def _getXlsxReportName(self):
return 'a_f_r.report_aged_partner_balance_xlsx'
diff --git a/account_financial_report/tests/test_general_ledger.py b/account_financial_report/tests/test_general_ledger.py
index ca218b91..95328ba9 100644
--- a/account_financial_report/tests/test_general_ledger.py
+++ b/account_financial_report/tests/test_general_ledger.py
@@ -19,6 +19,9 @@ class TestGeneralLedger(a_t_f_c.AbstractTestForeignCurrency):
def _getQwebReportName(self):
return 'account_financial_report.report_general_ledger_qweb'
+ def _getHtmlReportName(self):
+ return 'account_financial_report.report_general_ledger_html_qweb'
+
def _getXlsxReportName(self):
return 'a_f_r.report_general_ledger_xlsx'
diff --git a/account_financial_report/tests/test_journal_ledger.py b/account_financial_report/tests/test_journal_ledger.py
index 2a293013..f22842fd 100644
--- a/account_financial_report/tests/test_journal_ledger.py
+++ b/account_financial_report/tests/test_journal_ledger.py
@@ -22,6 +22,9 @@ class TestJournalLedger(a_t_f_c.AbstractTestForeignCurrency):
def _getQwebReportName(self):
return 'account_financial_report.report_journal_ledger_qweb'
+ def _getHtmlReportName(self):
+ return 'account_financial_report.report_journal_ledger_html_qweb'
+
def _getXlsxReportName(self):
return 'a_f_r.report_journal_ledger_xlsx'
@@ -58,7 +61,7 @@ class TestJournalLedger(a_t_f_c.AbstractTestForeignCurrency):
self.assertDictContainsSubset(
{
'type': 'ir.actions.report',
- 'report_name': self.qweb_report_name,
+ 'report_name': self.html_report_name,
'report_type': 'qweb-html',
},
report_action
@@ -66,7 +69,7 @@ class TestJournalLedger(a_t_f_c.AbstractTestForeignCurrency):
# Check if report template is correct
report = self.env['ir.actions.report'].search(
- [('report_name', '=', self.qweb_report_name),
+ [('report_name', '=', self.html_report_name),
('report_type', '=', report_type)], limit=1)
self.assertEqual(report.report_type, 'qweb-html')
diff --git a/account_financial_report/tests/test_open_items.py b/account_financial_report/tests/test_open_items.py
index 5456c135..5f4269d6 100644
--- a/account_financial_report/tests/test_open_items.py
+++ b/account_financial_report/tests/test_open_items.py
@@ -17,6 +17,9 @@ class TestOpenItems(a_t_f_c.AbstractTestForeignCurrency):
def _getQwebReportName(self):
return 'account_financial_report.report_open_items_qweb'
+ def _getHtmlReportName(self):
+ return 'account_financial_report.report_open_items_html_qweb'
+
def _getXlsxReportName(self):
return 'a_f_r.report_open_items_xlsx'
diff --git a/account_financial_report/tests/test_trial_balance.py b/account_financial_report/tests/test_trial_balance.py
index 48d0bc20..8427e98a 100644
--- a/account_financial_report/tests/test_trial_balance.py
+++ b/account_financial_report/tests/test_trial_balance.py
@@ -19,6 +19,9 @@ class TestTrialBalance(a_t_f_c.AbstractTestForeignCurrency):
def _getQwebReportName(self):
return 'account_financial_report.report_trial_balance_qweb'
+ def _getHtmlReportName(self):
+ return 'account_financial_report.report_trial_balance_html_qweb'
+
def _getXlsxReportName(self):
return 'a_f_r.report_trial_balance_xlsx'