diff --git a/account_financial_report/README.rst b/account_financial_report/README.rst index a5a216f6..7f6b8b2d 100644 --- a/account_financial_report/README.rst +++ b/account_financial_report/README.rst @@ -129,6 +129,7 @@ Contributors * Sergio Teruel * Ernesto Tejeda * João Marques + * Alexandre D. Díaz Much of the work in this module was done at a sprint in Sorrento, Italy in April 2016. diff --git a/account_financial_report/__manifest__.py b/account_financial_report/__manifest__.py index ed2a438a..436751c9 100644 --- a/account_financial_report/__manifest__.py +++ b/account_financial_report/__manifest__.py @@ -42,6 +42,7 @@ "view/report_aged_partner_balance.xml", "view/report_vat_report.xml", ], + "qweb": ["static/src/xml/report.xml"], "installable": True, "application": True, "auto_install": False, diff --git a/account_financial_report/readme/CONTRIBUTORS.rst b/account_financial_report/readme/CONTRIBUTORS.rst index 01623285..e8ee8657 100644 --- a/account_financial_report/readme/CONTRIBUTORS.rst +++ b/account_financial_report/readme/CONTRIBUTORS.rst @@ -22,6 +22,7 @@ * Sergio Teruel * Ernesto Tejeda * João Marques + * Alexandre D. Díaz Much of the work in this module was done at a sprint in Sorrento, Italy in April 2016. diff --git a/account_financial_report/report/templates/aged_partner_balance.xml b/account_financial_report/report/templates/aged_partner_balance.xml index 9b8e0b7b..01ab1827 100644 --- a/account_financial_report/report/templates/aged_partner_balance.xml +++ b/account_financial_report/report/templates/aged_partner_balance.xml @@ -248,210 +248,210 @@
- - - - - - - - - + + + +
- - - - - - - - + + +
- - - - - - - - + + +
- - - - - - - - + + +
- - - - - - - - + + +
- - - - - - - - + + +
- - - - - - - - - + + + +
- - - - - - - - + + +
- - - - - - - - - - - - - + + + + + + + +
- - - - - - - - - - - - - + + + + + + + +
- - - - - - - - - - - - - + + + + + + + +
- - - - - - - - - - - - - + + + + + + + +
- - - - - - - - - - - - - + + + + + + + +
- - - - - - - - - - - - - + + + + + + + +
diff --git a/account_financial_report/report/templates/general_ledger.xml b/account_financial_report/report/templates/general_ledger.xml index 5405383d..bc48f130 100644 --- a/account_financial_report/report/templates/general_ledger.xml +++ b/account_financial_report/report/templates/general_ledger.xml @@ -232,18 +232,11 @@ ('date', '<', date_from), ('debit', '<>', 0)]" /> - - - - + + @@ -254,18 +247,11 @@ ('date', '<', date_from), ('debit', '<>', 0)]" /> - - + + @@ -278,18 +264,11 @@ ('date', '<', date_from), ('credit', '<>', 0)]" /> - - + + @@ -300,18 +279,11 @@ ('date', '<', date_from), ('credit', '<>', 0)]" /> - - + + @@ -323,18 +295,11 @@ t-value="[('account_id', '=', account['id']), ('date', '<', date_from)]" /> - - + + @@ -344,18 +309,11 @@ ('partner_id', '=', partner['id']), ('date', '<', date_from)]" /> - - + + @@ -375,18 +333,14 @@ t-value="[('account_id', '=', account['id']), ('date', '<', o.date_from)]" /> - - + + @@ -396,18 +350,14 @@ ('partner_id', '=', partner['id']), ('date', '<', o.date_from)]" /> - - + + @@ -426,82 +376,63 @@
- - - - - - - - - + + + + + + + + + + + +
- - - + +
- - - + +
- - - + +
@@ -516,58 +447,45 @@
- - - - + +
- - - + + - + - +
- - - - + +
@@ -584,111 +502,82 @@
- - - - + +
- - - + + - + - +
- - - + + - + - +
- - - + + - + - +
@@ -700,16 +589,12 @@
- - - + +
@@ -799,7 +684,7 @@ />