diff --git a/account_financial_report/README.rst b/account_financial_report/README.rst index 3580fc7d..2ad4a9ab 100644 --- a/account_financial_report/README.rst +++ b/account_financial_report/README.rst @@ -128,6 +128,7 @@ Contributors * Pedro M. Baeza * Sergio Teruel * Ernesto Tejeda + * Alexandre D. Díaz * Lois Rilo diff --git a/account_financial_report/__manifest__.py b/account_financial_report/__manifest__.py index bc4c5621..c57e1b35 100644 --- a/account_financial_report/__manifest__.py +++ b/account_financial_report/__manifest__.py @@ -40,6 +40,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 9522dd39..2e2c067a 100644 --- a/account_financial_report/readme/CONTRIBUTORS.rst +++ b/account_financial_report/readme/CONTRIBUTORS.rst @@ -21,6 +21,7 @@ * Pedro M. Baeza * Sergio Teruel * Ernesto Tejeda + * Alexandre D. Díaz * Lois Rilo diff --git a/account_financial_report/report/templates/aged_partner_balance.xml b/account_financial_report/report/templates/aged_partner_balance.xml index e5f4a8d1..d7cf9de6 100644 --- a/account_financial_report/report/templates/aged_partner_balance.xml +++ b/account_financial_report/report/templates/aged_partner_balance.xml @@ -234,210 +234,210 @@
- - - - - - - - - + + + +
- - - - - - - - + + +
- - - - - - - - + + +
- - - - - - - - + + +
- - - - - - - - + + +
- - - - - - - - + + +
- - - - - - - - - + + + +
- - - - - - - - + + +
- - - - - - - - - - - - - + + + + + + + +
- - - - - - - - - - - - - + + + + + + + +
- - - - - - - - - - - - - + + + + + + + +
- - - - - - - - - - - - - + + + + + + + +
- - - - - - - - - - - - - + + + + + + + +
- - - - - - - - - - - - - + + + + + + + +
diff --git a/account_financial_report/report/templates/general_ledger.xml b/account_financial_report/report/templates/general_ledger.xml index 5498839e..e4553f1b 100644 --- a/account_financial_report/report/templates/general_ledger.xml +++ b/account_financial_report/report/templates/general_ledger.xml @@ -226,18 +226,11 @@ ('date', '<', date_from), ('debit', '<>', 0)]" /> - - + + @@ -248,18 +241,11 @@ ('date', '<', date_from), ('debit', '<>', 0)]" /> - - + + @@ -272,18 +258,11 @@ ('date', '<', date_from), ('credit', '<>', 0)]" /> - - + + @@ -294,18 +273,11 @@ ('date', '<', date_from), ('credit', '<>', 0)]" /> - - + + @@ -317,18 +289,11 @@ t-value="[('account_id', '=', account['id']), ('date', '<', date_from)]" /> - - + + @@ -338,18 +303,11 @@ ('partner_id', '=', partner['id']), ('date', '<', date_from)]" /> - - + + @@ -369,18 +327,14 @@ t-value="[('account_id', '=', account['id']), ('date', '<', o.date_from)]" /> - - + + @@ -390,18 +344,14 @@ ('partner_id', '=', partner['id']), ('date', '<', o.date_from)]" /> - - + + @@ -420,82 +370,63 @@
- - - - - - - - - + + + + + + + + + + + +
- - - + +
- - - + +
- - - + +
@@ -510,58 +441,45 @@
- - - - + +
- - - + + - + - +
- - - - + +
@@ -578,111 +496,82 @@
- - - - + +
- - - + + - + - +
- - - + + - + - +
- - - + + - + - +
@@ -694,16 +583,12 @@
- - - + +
@@ -791,7 +676,7 @@ />