From bd5cf3f63c415e9e6ce5927a7a5a0691faaebedd Mon Sep 17 00:00:00 2001 From: mreficent Date: Fri, 18 Aug 2017 13:48:46 +0200 Subject: [PATCH] [10.0][MIG] account_financial_report_horizontal --- .../README.rst | 36 +++++++++++++++---- .../__init__.py | 2 ++ .../__manifest__.py | 4 +-- .../data/ir_actions_report_xml.xml | 6 ++-- .../data/report_paperformat.xml | 6 ++-- .../models/__init__.py | 1 + .../models/account_financial_report.py | 3 +- .../report/__init__.py | 1 + .../report/report_financial.py | 7 ++-- .../report/report_financial.xml | 6 ++-- ...est_account_financial_report_horizontal.py | 4 +-- 11 files changed, 50 insertions(+), 26 deletions(-) diff --git a/account_financial_report_horizontal/README.rst b/account_financial_report_horizontal/README.rst index da34445f..077331da 100644 --- a/account_financial_report_horizontal/README.rst +++ b/account_financial_report_horizontal/README.rst @@ -1,19 +1,41 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :alt: License: AGPL-3 + :target: http://www.gnu.org/licenses/agpl + :alt: License: AGPL-3 -Accounting Financial Reports Horizontal -======================================= +====================================== +Accounting Financial Report Horizontal +====================================== -This addon provides a balance sheet and profit and loss report in landscape mode with assets to the left and liabilities to the right as is common in Italy and the Netherlands. +This module provides a balance sheet and profit and loss report in landscape +mode with assets to the left and liabilities to the right as is common in +Italy and the Netherlands. Usage ===== -After the module is installed, the balance sheet and profit and loss reports will be in landscape mode with assets left and liabilities right. +After the module is installed, the balance sheet and profit and loss reports +will be in landscape mode with assets left and liabilities right. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/91/10.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smash it by providing detailed and welcomed feedback. Credits ======= +Images +------ + +* Odoo Community Association: `Icon `_. + Contributors ------------ @@ -21,6 +43,8 @@ Contributors * Holger Brunn * Stefan Rijnhart +Do not contact contributors directly about support or help with technical issues. + Maintainer ---------- @@ -34,4 +58,4 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit http://odoo-community.org. +To contribute to this module, please visit https://odoo-community.org. diff --git a/account_financial_report_horizontal/__init__.py b/account_financial_report_horizontal/__init__.py index 59b4cb50..4cbc5614 100644 --- a/account_financial_report_horizontal/__init__.py +++ b/account_financial_report_horizontal/__init__.py @@ -1,2 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import report from . import models diff --git a/account_financial_report_horizontal/__manifest__.py b/account_financial_report_horizontal/__manifest__.py index ee65eeb7..3b79db47 100644 --- a/account_financial_report_horizontal/__manifest__.py +++ b/account_financial_report_horizontal/__manifest__.py @@ -4,8 +4,8 @@ # # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { - "name": "Accounting Financial Reports Horizontal", - "version": "9.0.0.0.0", + "name": "Accounting Financial Report Horizontal", + "version": "10.0.1.0.0", "author": "Therp BV,Agile Business Group,Odoo Community Association (OCA)", "category": 'Accounting & Finance', 'website': 'https://github.com/OCA/account-financial-reporting', diff --git a/account_financial_report_horizontal/data/ir_actions_report_xml.xml b/account_financial_report_horizontal/data/ir_actions_report_xml.xml index ef9cdda9..1c0c8b2c 100644 --- a/account_financial_report_horizontal/data/ir_actions_report_xml.xml +++ b/account_financial_report_horizontal/data/ir_actions_report_xml.xml @@ -1,8 +1,6 @@ - - + - - + diff --git a/account_financial_report_horizontal/data/report_paperformat.xml b/account_financial_report_horizontal/data/report_paperformat.xml index 516ab541..506db411 100644 --- a/account_financial_report_horizontal/data/report_paperformat.xml +++ b/account_financial_report_horizontal/data/report_paperformat.xml @@ -1,6 +1,5 @@ - - + European A4 (Landscape) A4 @@ -15,5 +14,4 @@ 35 90 - - + diff --git a/account_financial_report_horizontal/models/__init__.py b/account_financial_report_horizontal/models/__init__.py index 3e6d5600..df355783 100644 --- a/account_financial_report_horizontal/models/__init__.py +++ b/account_financial_report_horizontal/models/__init__.py @@ -1,3 +1,4 @@ # -*- coding: utf-8 -*- # © 2015 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import account_financial_report diff --git a/account_financial_report_horizontal/models/account_financial_report.py b/account_financial_report_horizontal/models/account_financial_report.py index a645324b..ab993e61 100644 --- a/account_financial_report_horizontal/models/account_financial_report.py +++ b/account_financial_report_horizontal/models/account_financial_report.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # © 2015 Therp BV -from openerp import models, api +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo import api, models class AccountFinancialReport(models.Model): diff --git a/account_financial_report_horizontal/report/__init__.py b/account_financial_report_horizontal/report/__init__.py index 51dba30c..f27c91ff 100644 --- a/account_financial_report_horizontal/report/__init__.py +++ b/account_financial_report_horizontal/report/__init__.py @@ -1,3 +1,4 @@ # -*- coding: utf-8 -*- # © 2015 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import report_financial diff --git a/account_financial_report_horizontal/report/report_financial.py b/account_financial_report_horizontal/report/report_financial.py index a4cc7600..09defb57 100644 --- a/account_financial_report_horizontal/report/report_financial.py +++ b/account_financial_report_horizontal/report/report_financial.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # © 2016 Therp BV -from openerp import api, models +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo import api, models class ReportFinancial(models.AbstractModel): @@ -20,9 +21,9 @@ class ReportFinancial(models.AbstractModel): return self.get_account_lines(data, side='right') @api.multi - def render_html(self, data): + def render_html(self, docids, data): data.setdefault('form', {}).update( get_left_lines=self.get_left_lines, get_right_lines=self.get_right_lines, ) - return super(ReportFinancial, self).render_html(data) + return super(ReportFinancial, self).render_html(docids, data) diff --git a/account_financial_report_horizontal/report/report_financial.xml b/account_financial_report_horizontal/report/report_financial.xml index 9eb42ae7..17e68781 100644 --- a/account_financial_report_horizontal/report/report_financial.xml +++ b/account_financial_report_horizontal/report/report_financial.xml @@ -1,6 +1,5 @@ - - + - - + diff --git a/account_financial_report_horizontal/tests/test_account_financial_report_horizontal.py b/account_financial_report_horizontal/tests/test_account_financial_report_horizontal.py index 90723712..b0d25a45 100644 --- a/account_financial_report_horizontal/tests/test_account_financial_report_horizontal.py +++ b/account_financial_report_horizontal/tests/test_account_financial_report_horizontal.py @@ -2,7 +2,7 @@ # © 2016 Therp BV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from lxml import etree -from openerp.tests.common import TransactionCase +from odoo.tests.common import TransactionCase class TestAccountFinancialReportHorizontal(TransactionCase): @@ -14,7 +14,7 @@ class TestAccountFinancialReportHorizontal(TransactionCase): data = action['data'] html = self.env['report'].with_context(action['context']).get_html( self.env[data['model']].browse(data['ids']), - action['report_name'], + report_name=action['report_name'], data=data, ) self.assertTrue(etree.fromstring(html).xpath('//div[@class="row"]'))