From 0b3614bc38e03608b2f74ad359f54a13b184986f Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Wed, 25 Mar 2020 09:41:09 +0100 Subject: [PATCH 1/3] [13.0][ADD]account_move_line_report_xls greenify --- account_move_line_report_xls/README.rst | 49 +++ account_move_line_report_xls/__init__.py | 11 + account_move_line_report_xls/__manifest__.py | 15 + account_move_line_report_xls/i18n/fr.po | 181 ++++++++ account_move_line_report_xls/i18n/nl.po | 181 ++++++++ .../models/__init__.py | 1 + .../models/account_move_line.py | 60 +++ .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 2 + account_move_line_report_xls/readme/USAGE.rst | 27 ++ .../report/__init__.py | 1 + .../report/account_move_line_xlsx.py | 401 ++++++++++++++++++ .../report/account_move_line_xlsx.xml | 15 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/icon.svg | 79 ++++ .../tests/__init__.py | 1 + .../tests/test_aml_report_xlsx.py | 32 ++ 17 files changed, 1057 insertions(+) create mode 100644 account_move_line_report_xls/README.rst create mode 100644 account_move_line_report_xls/__init__.py create mode 100644 account_move_line_report_xls/__manifest__.py create mode 100644 account_move_line_report_xls/i18n/fr.po create mode 100644 account_move_line_report_xls/i18n/nl.po create mode 100644 account_move_line_report_xls/models/__init__.py create mode 100644 account_move_line_report_xls/models/account_move_line.py create mode 100644 account_move_line_report_xls/readme/CONTRIBUTORS.rst create mode 100644 account_move_line_report_xls/readme/DESCRIPTION.rst create mode 100644 account_move_line_report_xls/readme/USAGE.rst create mode 100644 account_move_line_report_xls/report/__init__.py create mode 100644 account_move_line_report_xls/report/account_move_line_xlsx.py create mode 100644 account_move_line_report_xls/report/account_move_line_xlsx.xml create mode 100644 account_move_line_report_xls/static/description/icon.png create mode 100644 account_move_line_report_xls/static/description/icon.svg create mode 100644 account_move_line_report_xls/tests/__init__.py create mode 100644 account_move_line_report_xls/tests/test_aml_report_xlsx.py diff --git a/account_move_line_report_xls/README.rst b/account_move_line_report_xls/README.rst new file mode 100644 index 00000000..5a1c9f20 --- /dev/null +++ b/account_move_line_report_xls/README.rst @@ -0,0 +1,49 @@ +.. image:: https://img.shields.io/badge/license-AGPL--3-blue.png + :target: https://www.gnu.org/licenses/agpl + :alt: License: AGPL-3 + +========================== +Journal Items Excel Export +========================== + +This module extends the functionality of the journal items +('account.move.line') list view and allow you to export the selected lines. + +Installation +============ + +To install this module, you need also the **report_xlsx_helper** +module located in: + +https://github.com/OCA/reporting-engine + +Usage +===== + +To use this module, you need to: + +* go to the list view of the journal items +* select the lines you wish to export +* click on the button on top to export + +The Excel export can be tailored to your exact needs via the following methods +of the 'account.move.line' object: + +* **_report_xlsx_fields** + + Add/drop columns or change order from the list of columns that are defined + in the Excel template. + + The following fields are defined in the Excel template: + + move, name, date, journal, period, partner, account, + date_maturity, debit, credit, balance, + reconcile, reconcile_partial, analytic_account, + ref, partner_ref, tax_code, tax_amount, amount_residual, + amount_currency, currency_name, company_currency, + amount_residual_currency, product, product_ref', product_uom, quantity, + statement, invoice, narration, blocked + +* **_report_xlsx_template** + + Change/extend the Excel template. diff --git a/account_move_line_report_xls/__init__.py b/account_move_line_report_xls/__init__.py new file mode 100644 index 00000000..020337dd --- /dev/null +++ b/account_move_line_report_xls/__init__.py @@ -0,0 +1,11 @@ +from . import models + +try: + from . import report +except ImportError: + import logging + + logging.getLogger("odoo.module").warning( + """report_xlsx_helper not available in addons path. + account_move_line_report_xls will not be usable""" + ) diff --git a/account_move_line_report_xls/__manifest__.py b/account_move_line_report_xls/__manifest__.py new file mode 100644 index 00000000..67f38a10 --- /dev/null +++ b/account_move_line_report_xls/__manifest__.py @@ -0,0 +1,15 @@ +# Copyright 2009-2020 Noviat. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Account Move Line XLSX export", + "version": "13.0.1.0.0", + "license": "AGPL-3", + "author": "Noviat, Odoo Community Association (OCA)", + "category": "Accounting & Finance", + "website": "https://github.com/OCA/account-financial-reporting", + "summary": "Journal Items Excel export", + "depends": ["account", "report_xlsx_helper"], + "data": ["report/account_move_line_xlsx.xml"], + "installable": True, +} diff --git a/account_move_line_report_xls/i18n/fr.po b/account_move_line_report_xls/i18n/fr.po new file mode 100644 index 00000000..0e8e8639 --- /dev/null +++ b/account_move_line_report_xls/i18n/fr.po @@ -0,0 +1,181 @@ +# French translation of Odoo. +# This file contains the translation of the following modules: +# * account_move_line_report_xls +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: support@noviat.com\n" +"POT-Creation-Date: 2016-05-16 12:31:16.568000\n" +"PO-Revision-Date: 2016-05-16 12:31:16.568000\n" +"Last-Translator: Luc De Meyer (Noviat nv/sa)\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Journal Items" +msgstr "Écritures comptables" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Entry" +msgstr "Écriture" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Name" +msgstr "Nom" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Reference" +msgstr "Référence" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Effective Date" +msgstr "Date" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Period" +msgstr "Période" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Partner" +msgstr "Partenaire" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Partner Reference" +msgstr "Réf. Partenaire" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Account" +msgstr "Compte" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Maturity Date" +msgstr "Date d'échéance" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Debit" +msgstr "Débit" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Credit" +msgstr "Crédit" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Balance" +msgstr "Solde" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Rec." +msgstr "Let." + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Part. Rec." +msgstr "Let. Part." + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Tax Code" +msgstr "Case TVA" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Tax/Base Amount" +msgstr "Montant TVA/Base" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Am. Currency" +msgstr "Montant devise" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Curr." +msgstr "Dev." + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Journal" +msgstr "Journal" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Comp. Curr." +msgstr "Dev. Soc." + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Analytic Account" +msgstr "Compte analytique" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Analytic Account Reference" +msgstr "Référence compte analytique" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Product" +msgstr "Article" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Product Reference" +msgstr "Réf. Article" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Unit of Measure" +msgstr "Unité de mesure" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Qty" +msgstr "Qty" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Statement" +msgstr "Relevé" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Invoice" +msgstr "Facture" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Residual Amount" +msgstr "Montant résiduel" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Res. Am. in Curr." +msgstr "Montant résiduel en dev." + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Notes" +msgstr "Notes" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Lit." +msgstr "Lit." + diff --git a/account_move_line_report_xls/i18n/nl.po b/account_move_line_report_xls/i18n/nl.po new file mode 100644 index 00000000..fed06d5c --- /dev/null +++ b/account_move_line_report_xls/i18n/nl.po @@ -0,0 +1,181 @@ +# Dutch translation of Odoo. +# This file contains the translation of the following modules: +# * account_move_line_report_xls +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: support@noviat.com\n" +"POT-Creation-Date: 2016-05-16 12:31:16.564000\n" +"PO-Revision-Date: 2016-05-16 12:31:16.564000\n" +"Last-Translator: Luc De Meyer (Noviat nv/sa)\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Journal Items" +msgstr "Boekingsregels" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Entry" +msgstr "Boeking" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Name" +msgstr "Naam" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Reference" +msgstr "Referentie" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Effective Date" +msgstr "Datum" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Period" +msgstr "Periode" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Partner" +msgstr "Partner" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Partner Reference" +msgstr "Ref. Partner" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Account" +msgstr "Rekening" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Maturity Date" +msgstr "Vervaldatum" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Debit" +msgstr "Debet" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Credit" +msgstr "Credit" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Balance" +msgstr "Saldo" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Rec." +msgstr "Rec." + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Part. Rec." +msgstr "Rec. Part." + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Tax Code" +msgstr "BTW vak" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Tax/Base Amount" +msgstr "Bedrag BTW/Mvh" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Am. Currency" +msgstr "Bedrag valuta" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Curr." +msgstr "Val." + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Journal" +msgstr "Dagboek" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Comp. Curr." +msgstr "Bedr. Val." + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Analytic Account" +msgstr "Kostenplaats" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Analytic Account Reference" +msgstr "Kostenplaats referentie" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Product" +msgstr "Product" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Product Reference" +msgstr "Ref. Product" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Unit of Measure" +msgstr "Maateenheid" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Qty" +msgstr "HvH" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Statement" +msgstr "Uitreksel" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Invoice" +msgstr "Factuur" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Residual Amount" +msgstr "Restbedrag" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Res. Am. in Curr." +msgstr "Restbedrag in val." + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Notes" +msgstr "Notities" + +#. module: account_move_line_report_xls +#: report:move.line.list.xls:0 +msgid "Lit." +msgstr "Lit." + diff --git a/account_move_line_report_xls/models/__init__.py b/account_move_line_report_xls/models/__init__.py new file mode 100644 index 00000000..8795b3be --- /dev/null +++ b/account_move_line_report_xls/models/__init__.py @@ -0,0 +1 @@ +from . import account_move_line diff --git a/account_move_line_report_xls/models/account_move_line.py b/account_move_line_report_xls/models/account_move_line.py new file mode 100644 index 00000000..9f3ab2cf --- /dev/null +++ b/account_move_line_report_xls/models/account_move_line.py @@ -0,0 +1,60 @@ +# Copyright 2009-2020 Noviat. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, models + +from odoo.addons.report_xlsx_helper.report.report_xlsx_abstract import ( + ReportXlsxAbstract, +) + +_render = ReportXlsxAbstract._render + + +class AccountMoveLine(models.Model): + _inherit = "account.move.line" + + # Change list in custom module e.g. to add/drop columns or change order + @api.model + def _report_xlsx_fields(self): + return [ + "move", + "name", + "date", + "journal", + "partner", + "account", + "date_maturity", + "debit", + "credit", + "balance", + "full_reconcile", + "reconcile_amount", + # 'analytic_account_name', 'analytic_account', + # 'ref', 'partner_ref', + # 'amount_residual', 'amount_currency', 'currency_name', + # 'company_currency', 'amount_residual_currency', + # 'product', 'product_ref', 'product_uom', 'quantity', + # 'statement', 'invoice', 'narration', 'blocked', + # 'id', 'matched_debit_ids', 'matched_credit_ids', + ] + + # Change/Add Template entries + @api.model + def _report_xlsx_template(self): + """ + Template updates, e.g. + + my_change = { + 'move': { + 'header': { + 'value': 'My Move Title', + }, + 'lines': { + 'value': _render("line.move_id.name or ''"), + }, + 'width': 20, + }, + } + return my_change + """ + return {} diff --git a/account_move_line_report_xls/readme/CONTRIBUTORS.rst b/account_move_line_report_xls/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..044d1a00 --- /dev/null +++ b/account_move_line_report_xls/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Luc De Meyer diff --git a/account_move_line_report_xls/readme/DESCRIPTION.rst b/account_move_line_report_xls/readme/DESCRIPTION.rst new file mode 100644 index 00000000..d342869c --- /dev/null +++ b/account_move_line_report_xls/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module extends the functionality of the journal items +('account.move.line') list view and allow you to export the selected lines. diff --git a/account_move_line_report_xls/readme/USAGE.rst b/account_move_line_report_xls/readme/USAGE.rst new file mode 100644 index 00000000..801143bb --- /dev/null +++ b/account_move_line_report_xls/readme/USAGE.rst @@ -0,0 +1,27 @@ +To use this module, you need to: + +* go to the list view of the journal items +* select the lines you wish to export +* click on the button on top to export + +The Excel export can be tailored to your exact needs via the following methods +of the 'account.move.line' object: + +* **_report_xlsx_fields** + + Add/drop columns or change order from the list of columns that are defined + in the Excel template. + + The following fields are defined in the Excel template: + + move, name, date, journal, period, partner, account, + date_maturity, debit, credit, balance, + reconcile, reconcile_partial, analytic_account, + ref, partner_ref, tax_code, tax_amount, amount_residual, + amount_currency, currency_name, company_currency, + amount_residual_currency, product, product_ref', product_uom, quantity, + statement, invoice, narration, blocked + +* **_report_xlsx_template** + + Change/extend the Excel template. diff --git a/account_move_line_report_xls/report/__init__.py b/account_move_line_report_xls/report/__init__.py new file mode 100644 index 00000000..dc9f47cd --- /dev/null +++ b/account_move_line_report_xls/report/__init__.py @@ -0,0 +1 @@ +from . import account_move_line_xlsx diff --git a/account_move_line_report_xls/report/account_move_line_xlsx.py b/account_move_line_report_xls/report/account_move_line_xlsx.py new file mode 100644 index 00000000..8e7b86b1 --- /dev/null +++ b/account_move_line_report_xls/report/account_move_line_xlsx.py @@ -0,0 +1,401 @@ +# Copyright 2009-2020 Noviat +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +import logging + +from odoo import models +from odoo.tools.translate import translate + +_logger = logging.getLogger(__name__) + +IR_TRANSLATION_NAME = "move.line.list.xls" + + +class AccountMoveLineXlsx(models.AbstractModel): + _name = "report.account_move_line_report_xls.account_move_line_xlsx" + _inherit = "report.report_xlsx.abstract" + + def _(self, src): + lang = self.env.context.get("lang", "en_US") + val = translate(self.env.cr, IR_TRANSLATION_NAME, "report", lang, src) or src + return val + + def _get_ws_params(self, workbook, data, amls): + + # XLSX Template + col_specs = { + "move": { + "header": {"value": self._("Entry")}, + "lines": {"value": self._render("line.move_id.name")}, + "width": 20, + }, + "name": { + "header": {"value": self._("Name")}, + "lines": {"value": self._render("line.name")}, + "width": 42, + }, + "ref": { + "header": {"value": self._("Reference")}, + "lines": {"value": self._render("line.ref")}, + "width": 42, + }, + "date": { + "header": {"value": self._("Effective Date")}, + "lines": { + "value": self._render("line.date"), + "format": self.format_tcell_date_left, + }, + "width": 13, + }, + "partner": { + "header": {"value": self._("Partner")}, + "lines": { + "value": self._render("line.partner_id and line.partner_id.name") + }, + "width": 36, + }, + "partner_ref": { + "header": {"value": self._("Partner Reference")}, + "lines": { + "value": self._render("line.partner_id and line.partner_id.ref") + }, + "width": 36, + }, + "account": { + "header": {"value": self._("Account")}, + "lines": {"value": self._render("line.account_id.code")}, + "width": 12, + }, + "date_maturity": { + "header": {"value": self._("Maturity Date")}, + "lines": { + "value": self._render("line.date_maturity"), + "format": self.format_tcell_date_left, + }, + "width": 13, + }, + "debit": { + "header": { + "value": self._("Debit"), + "format": self.format_theader_yellow_right, + }, + "lines": { + "value": self._render("line.debit"), + "format": self.format_tcell_amount_right, + }, + "totals": { + "type": "formula", + "value": self._render("debit_formula"), + "format": self.format_theader_yellow_amount_right, + }, + "width": 18, + }, + "credit": { + "header": { + "value": self._("Credit"), + "format": self.format_theader_yellow_right, + }, + "lines": { + "value": self._render("line.credit"), + "format": self.format_tcell_amount_right, + }, + "totals": { + "type": "formula", + "value": self._render("credit_formula"), + "format": self.format_theader_yellow_amount_right, + }, + "width": 18, + }, + "balance": { + "header": { + "value": self._("Balance"), + "format": self.format_theader_yellow_right, + }, + "lines": { + "value": self._render("line.balance"), + "format": self.format_tcell_amount_right, + }, + "totals": { + "type": "formula", + "value": self._render("bal_formula"), + "format": self.format_theader_yellow_amount_right, + }, + "width": 18, + }, + "full_reconcile": { + "header": { + "value": self._("Rec."), + "format": self.format_theader_yellow_center, + }, + "lines": { + "value": self._render( + "line.full_reconcile_id " "and line.full_reconcile_id.name" + ), + "format": self.format_tcell_center, + }, + "width": 12, + }, + "reconcile_amount": { + "header": {"value": self._("Reconcile Amount")}, + "lines": { + "value": self._render( + "line.full_reconcile_id and line.balance or " + "(sum(line.matched_credit_ids.mapped('amount')) - " + "sum(line.matched_debit_ids.mapped('amount')))" + ), + "format": self.format_tcell_amount_right, + }, + "width": 12, + }, + "matched_debit_ids": { + "header": {"value": self._("Matched Debits")}, + "lines": { + "value": self._render( + "line.matched_debit_ids " + "and str([x.debit_move_id.id " + "for x in line.matched_debit_ids])" + ) + }, + "width": 20, + }, + "matched_credit_ids": { + "header": {"value": self._("Matched Credits")}, + "lines": { + "value": self._render( + "line.matched_credit_ids " + "and str([x.credit_move_id.id " + "for x in line.matched_credit_ids])" + ) + }, + "width": 20, + }, + "amount_currency": { + "header": { + "value": self._("Am. Currency"), + "format": self.format_theader_yellow_right, + }, + "lines": { + "value": self._render("line.amount_currency"), + "format": self.format_tcell_amount_right, + }, + "width": 18, + }, + "currency_name": { + "header": { + "value": self._("Curr."), + "format": self.format_theader_yellow_center, + }, + "lines": { + "value": self._render("line.currency_id and line.currency_id.name"), + "format": self.format_tcell_center, + }, + "width": 6, + }, + "journal": { + "header": {"value": self._("Journal")}, + "lines": {"value": self._render("line.journal_id.code")}, + "width": 12, + }, + "company_currency": { + "header": { + "value": self._("Comp. Curr."), + "format": self.format_theader_yellow_center, + }, + "lines": { + "value": self._render("line.company_id.currency_id.name"), + "format": self.format_tcell_center, + }, + "width": 10, + }, + "analytic_account": { + "header": {"value": self._("Analytic Account Reference")}, + "lines": { + "value": self._render( + "line.analytic_account_id " "and line.analytic_account_id.code" + ) + }, + "width": 36, + }, + "analytic_account_name": { + "header": {"value": self._("Analytic Account")}, + "lines": { + "value": self._render( + "line.analytic_account_id " "and line.analytic_account_id.name" + ) + }, + "width": 36, + }, + "product": { + "header": {"value": self._("Product")}, + "lines": { + "value": self._render("line.product_id and line.product_id.name") + }, + "width": 36, + }, + "product_ref": { + "header": {"value": self._("Product Reference")}, + "lines": { + "value": self._render( + "line.product_id and line.product_id.default_code " "or ''" + ) + }, + "width": 36, + }, + "product_uom": { + "header": {"value": self._("Unit of Measure")}, + "lines": { + "value": self._render( + "line.product_uom_id and line.product_uom_id.name" + ) + }, + "width": 20, + }, + "quantity": { + "header": { + "value": self._("Qty"), + "format": self.format_theader_yellow_right, + }, + "lines": { + "value": self._render("line.quantity"), + "format": self.format_tcell_amount_right, + }, + "width": 8, + }, + "statement": { + "header": {"value": self._("Statement")}, + "lines": { + "value": self._render( + "line.statement_id and line.statement_id.name" + ) + }, + "width": 20, + }, + "invoice": { + "header": {"value": self._("Invoice")}, + "lines": { + "value": self._render("line.invoice_id and line.invoice_id.number") + }, + "width": 20, + }, + "amount_residual": { + "header": { + "value": self._("Residual Amount"), + "format": self.format_theader_yellow_right, + }, + "lines": { + "value": self._render("line.amount_residual"), + "format": self.format_tcell_amount_right, + }, + "width": 18, + }, + "amount_residual_currency": { + "header": { + "value": self._("Res. Am. in Curr."), + "format": self.format_theader_yellow_right, + }, + "lines": { + "value": self._render("line.amount_residual_currency"), + "format": self.format_tcell_amount_right, + }, + "width": 18, + }, + "narration": { + "header": {"value": self._("Notes")}, + "lines": {"value": self._render("line.move_id.narration or ''")}, + "width": 42, + }, + "blocked": { + "header": { + "value": self._("Lit."), + "format": self.format_theader_yellow_center, + }, + "lines": { + "value": self._render("line.blocked and 'x' or ''"), + "format": self.format_tcell_center, + }, + "width": 4, + }, + "id": { + "header": { + "value": self._("Id"), + "format": self.format_theader_yellow_right, + }, + "lines": { + "value": self._render("line.id"), + "format": self.format_tcell_integer_right, + }, + "width": 12, + }, + } + col_specs.update(self.env["account.move.line"]._report_xlsx_template()) + wanted_list = self.env["account.move.line"]._report_xlsx_fields() + title = self._("Journal Items") + + return [ + { + "ws_name": title, + "generate_ws_method": "_amls_export", + "title": title, + "wanted_list": wanted_list, + "col_specs": col_specs, + } + ] + + def _amls_export(self, workbook, ws, ws_params, data, amls): + + ws.set_landscape() + ws.fit_to_pages(1, 0) + ws.set_header(self.xls_headers["standard"]) + ws.set_footer(self.xls_footers["standard"]) + + self._set_column_width(ws, ws_params) + + row_pos = 0 + row_pos = self._write_ws_title(ws, row_pos, ws_params) + + row_pos = self._write_line( + ws, + row_pos, + ws_params, + col_specs_section="header", + default_format=self.format_theader_yellow_left, + ) + + ws.freeze_panes(row_pos, 0) + + wanted_list = ws_params["wanted_list"] + debit_pos = "debit" in wanted_list and wanted_list.index("debit") + credit_pos = "credit" in wanted_list and wanted_list.index("credit") + + for line in amls: + row_pos = self._write_line( + ws, + row_pos, + ws_params, + col_specs_section="lines", + render_space={"line": line}, + default_format=self.format_tcell_left, + ) + + aml_cnt = len(amls) + debit_start = self._rowcol_to_cell(row_pos - aml_cnt, debit_pos) + debit_stop = self._rowcol_to_cell(row_pos - 1, debit_pos) + debit_formula = "SUM({}:{})".format(debit_start, debit_stop) + credit_start = self._rowcol_to_cell(row_pos - aml_cnt, credit_pos) + credit_stop = self._rowcol_to_cell(row_pos - 1, credit_pos) + credit_formula = "SUM({}:{})".format(credit_start, credit_stop) + debit_cell = self._rowcol_to_cell(row_pos, debit_pos) + credit_cell = self._rowcol_to_cell(row_pos, credit_pos) + bal_formula = debit_cell + "-" + credit_cell + row_pos = self._write_line( + ws, + row_pos, + ws_params, + col_specs_section="totals", + render_space={ + "debit_formula": debit_formula, + "credit_formula": credit_formula, + "bal_formula": bal_formula, + }, + default_format=self.format_theader_yellow_left, + ) diff --git a/account_move_line_report_xls/report/account_move_line_xlsx.xml b/account_move_line_report_xls/report/account_move_line_xlsx.xml new file mode 100644 index 00000000..5bb04f80 --- /dev/null +++ b/account_move_line_report_xls/report/account_move_line_xlsx.xml @@ -0,0 +1,15 @@ + + + + Export Selected Lines + account.move.line + ir.actions.report + action + + account_move_line_report_xls.account_move_line_xlsx + account_move_line + xlsx + + diff --git a/account_move_line_report_xls/static/description/icon.png b/account_move_line_report_xls/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/account_move_line_report_xls/static/description/icon.svg b/account_move_line_report_xls/static/description/icon.svg new file mode 100644 index 00000000..a7a26d09 --- /dev/null +++ b/account_move_line_report_xls/static/description/icon.svg @@ -0,0 +1,79 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/account_move_line_report_xls/tests/__init__.py b/account_move_line_report_xls/tests/__init__.py new file mode 100644 index 00000000..f1626769 --- /dev/null +++ b/account_move_line_report_xls/tests/__init__.py @@ -0,0 +1 @@ +from . import test_aml_report_xlsx diff --git a/account_move_line_report_xls/tests/test_aml_report_xlsx.py b/account_move_line_report_xls/tests/test_aml_report_xlsx.py new file mode 100644 index 00000000..711e0dfc --- /dev/null +++ b/account_move_line_report_xls/tests/test_aml_report_xlsx.py @@ -0,0 +1,32 @@ +# Copyright 2009-2020 Noviat. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests.common import TransactionCase + + +class TestAmlReportXlsx(TransactionCase): + def setUp(self): + super(TestAmlReportXlsx, self).setUp() + self.report = self.env.ref( + "account_move_line_report_xls.action_account_move_line_xlsx" + ) + sale_journal = self.env["account.journal"].search([("type", "=", "sale")])[0] + ar = self.env["account.account"].search([("internal_type", "=", "receivable")])[ + 0 + ] + aml_vals = [ + {"name": "debit", "debit": 100, "account_id": ar.id}, + {"name": "credit", "credit": 100, "account_id": ar.id}, + ] + am = self.env["account.move"].create( + { + "name": "test", + "journal_id": sale_journal.id, + "line_ids": [(0, 0, x) for x in aml_vals], + } + ) + self.amls = am.line_ids + + def test_aml_report_xlsx(self): + report_xls = self.report.render_xlsx(self.amls.ids, None) + self.assertEqual(report_xls[1], "xlsx") From ff8ef39e8ae33b8ef0cb336db09d562f21edb708 Mon Sep 17 00:00:00 2001 From: Pieter Paulussen Date: Thu, 27 May 2021 13:23:53 +0200 Subject: [PATCH 2/3] [IMP] account_move_line_report_xls: black, isort, prettier --- .../odoo/addons/account_move_line_report_xls | 1 + setup/account_move_line_report_xls/setup.py | 6 ++++++ 2 files changed, 7 insertions(+) create mode 120000 setup/account_move_line_report_xls/odoo/addons/account_move_line_report_xls create mode 100644 setup/account_move_line_report_xls/setup.py diff --git a/setup/account_move_line_report_xls/odoo/addons/account_move_line_report_xls b/setup/account_move_line_report_xls/odoo/addons/account_move_line_report_xls new file mode 120000 index 00000000..72667032 --- /dev/null +++ b/setup/account_move_line_report_xls/odoo/addons/account_move_line_report_xls @@ -0,0 +1 @@ +../../../../account_move_line_report_xls \ No newline at end of file diff --git a/setup/account_move_line_report_xls/setup.py b/setup/account_move_line_report_xls/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_move_line_report_xls/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 0bdfebdb9014c75d38e45130378302e6057d8f8f Mon Sep 17 00:00:00 2001 From: Pieter Paulussen Date: Thu, 27 May 2021 13:24:41 +0200 Subject: [PATCH 3/3] [MIG] account_move_line_report_xls: Migration to 14.0 --- account_move_line_report_xls/__manifest__.py | 2 +- .../report/account_move_line_xlsx.py | 75 ++++++++++--------- .../tests/test_aml_report_xlsx.py | 2 +- 3 files changed, 42 insertions(+), 37 deletions(-) diff --git a/account_move_line_report_xls/__manifest__.py b/account_move_line_report_xls/__manifest__.py index 67f38a10..63263854 100644 --- a/account_move_line_report_xls/__manifest__.py +++ b/account_move_line_report_xls/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Account Move Line XLSX export", - "version": "13.0.1.0.0", + "version": "14.0.1.0.0", "license": "AGPL-3", "author": "Noviat, Odoo Community Association (OCA)", "category": "Accounting & Finance", diff --git a/account_move_line_report_xls/report/account_move_line_xlsx.py b/account_move_line_report_xls/report/account_move_line_xlsx.py index 8e7b86b1..84c2d1bc 100644 --- a/account_move_line_report_xls/report/account_move_line_xlsx.py +++ b/account_move_line_report_xls/report/account_move_line_xlsx.py @@ -6,6 +6,11 @@ import logging from odoo import models from odoo.tools.translate import translate +from odoo.addons.report_xlsx_helper.report.report_xlsx_format import ( + FORMATS, + XLS_HEADERS, +) + _logger = logging.getLogger(__name__) IR_TRANSLATION_NAME = "move.line.list.xls" @@ -43,7 +48,7 @@ class AccountMoveLineXlsx(models.AbstractModel): "header": {"value": self._("Effective Date")}, "lines": { "value": self._render("line.date"), - "format": self.format_tcell_date_left, + "format": FORMATS["format_tcell_date_left"], }, "width": 13, }, @@ -70,68 +75,68 @@ class AccountMoveLineXlsx(models.AbstractModel): "header": {"value": self._("Maturity Date")}, "lines": { "value": self._render("line.date_maturity"), - "format": self.format_tcell_date_left, + "format": FORMATS["format_tcell_date_left"], }, "width": 13, }, "debit": { "header": { "value": self._("Debit"), - "format": self.format_theader_yellow_right, + "format": FORMATS["format_theader_yellow_right"], }, "lines": { "value": self._render("line.debit"), - "format": self.format_tcell_amount_right, + "format": FORMATS["format_tcell_amount_right"], }, "totals": { "type": "formula", "value": self._render("debit_formula"), - "format": self.format_theader_yellow_amount_right, + "format": FORMATS["format_theader_yellow_amount_right"], }, "width": 18, }, "credit": { "header": { "value": self._("Credit"), - "format": self.format_theader_yellow_right, + "format": FORMATS["format_theader_yellow_right"], }, "lines": { "value": self._render("line.credit"), - "format": self.format_tcell_amount_right, + "format": FORMATS["format_tcell_amount_right"], }, "totals": { "type": "formula", "value": self._render("credit_formula"), - "format": self.format_theader_yellow_amount_right, + "format": FORMATS["format_theader_yellow_amount_right"], }, "width": 18, }, "balance": { "header": { "value": self._("Balance"), - "format": self.format_theader_yellow_right, + "format": FORMATS["format_theader_yellow_right"], }, "lines": { "value": self._render("line.balance"), - "format": self.format_tcell_amount_right, + "format": FORMATS["format_tcell_amount_right"], }, "totals": { "type": "formula", "value": self._render("bal_formula"), - "format": self.format_theader_yellow_amount_right, + "format": FORMATS["format_theader_yellow_amount_right"], }, "width": 18, }, "full_reconcile": { "header": { "value": self._("Rec."), - "format": self.format_theader_yellow_center, + "format": FORMATS["format_theader_yellow_center"], }, "lines": { "value": self._render( "line.full_reconcile_id " "and line.full_reconcile_id.name" ), - "format": self.format_tcell_center, + "format": FORMATS["format_tcell_center"], }, "width": 12, }, @@ -143,7 +148,7 @@ class AccountMoveLineXlsx(models.AbstractModel): "(sum(line.matched_credit_ids.mapped('amount')) - " "sum(line.matched_debit_ids.mapped('amount')))" ), - "format": self.format_tcell_amount_right, + "format": FORMATS["format_tcell_amount_right"], }, "width": 12, }, @@ -172,22 +177,22 @@ class AccountMoveLineXlsx(models.AbstractModel): "amount_currency": { "header": { "value": self._("Am. Currency"), - "format": self.format_theader_yellow_right, + "format": FORMATS["format_theader_yellow_right"], }, "lines": { "value": self._render("line.amount_currency"), - "format": self.format_tcell_amount_right, + "format": FORMATS["format_tcell_amount_right"], }, "width": 18, }, "currency_name": { "header": { "value": self._("Curr."), - "format": self.format_theader_yellow_center, + "format": FORMATS["format_theader_yellow_center"], }, "lines": { "value": self._render("line.currency_id and line.currency_id.name"), - "format": self.format_tcell_center, + "format": FORMATS["format_tcell_center"], }, "width": 6, }, @@ -199,11 +204,11 @@ class AccountMoveLineXlsx(models.AbstractModel): "company_currency": { "header": { "value": self._("Comp. Curr."), - "format": self.format_theader_yellow_center, + "format": FORMATS["format_theader_yellow_center"], }, "lines": { "value": self._render("line.company_id.currency_id.name"), - "format": self.format_tcell_center, + "format": FORMATS["format_tcell_center"], }, "width": 10, }, @@ -253,11 +258,11 @@ class AccountMoveLineXlsx(models.AbstractModel): "quantity": { "header": { "value": self._("Qty"), - "format": self.format_theader_yellow_right, + "format": FORMATS["format_theader_yellow_right"], }, "lines": { "value": self._render("line.quantity"), - "format": self.format_tcell_amount_right, + "format": FORMATS["format_tcell_amount_right"], }, "width": 8, }, @@ -280,22 +285,22 @@ class AccountMoveLineXlsx(models.AbstractModel): "amount_residual": { "header": { "value": self._("Residual Amount"), - "format": self.format_theader_yellow_right, + "format": FORMATS["format_theader_yellow_right"], }, "lines": { "value": self._render("line.amount_residual"), - "format": self.format_tcell_amount_right, + "format": FORMATS["format_tcell_amount_right"], }, "width": 18, }, "amount_residual_currency": { "header": { "value": self._("Res. Am. in Curr."), - "format": self.format_theader_yellow_right, + "format": FORMATS["format_theader_yellow_right"], }, "lines": { "value": self._render("line.amount_residual_currency"), - "format": self.format_tcell_amount_right, + "format": FORMATS["format_tcell_amount_right"], }, "width": 18, }, @@ -307,22 +312,22 @@ class AccountMoveLineXlsx(models.AbstractModel): "blocked": { "header": { "value": self._("Lit."), - "format": self.format_theader_yellow_center, + "format": FORMATS["format_theader_yellow_center"], }, "lines": { "value": self._render("line.blocked and 'x' or ''"), - "format": self.format_tcell_center, + "format": FORMATS["format_tcell_center"], }, "width": 4, }, "id": { "header": { "value": self._("Id"), - "format": self.format_theader_yellow_right, + "format": FORMATS["format_theader_yellow_right"], }, "lines": { "value": self._render("line.id"), - "format": self.format_tcell_integer_right, + "format": FORMATS["format_tcell_integer_right"], }, "width": 12, }, @@ -345,8 +350,8 @@ class AccountMoveLineXlsx(models.AbstractModel): ws.set_landscape() ws.fit_to_pages(1, 0) - ws.set_header(self.xls_headers["standard"]) - ws.set_footer(self.xls_footers["standard"]) + ws.set_header(XLS_HEADERS["xls_headers"]["standard"]) + ws.set_footer(XLS_HEADERS["xls_footers"]["standard"]) self._set_column_width(ws, ws_params) @@ -358,7 +363,7 @@ class AccountMoveLineXlsx(models.AbstractModel): row_pos, ws_params, col_specs_section="header", - default_format=self.format_theader_yellow_left, + default_format=FORMATS["format_theader_yellow_left"], ) ws.freeze_panes(row_pos, 0) @@ -374,7 +379,7 @@ class AccountMoveLineXlsx(models.AbstractModel): ws_params, col_specs_section="lines", render_space={"line": line}, - default_format=self.format_tcell_left, + default_format=FORMATS["format_tcell_left"], ) aml_cnt = len(amls) @@ -397,5 +402,5 @@ class AccountMoveLineXlsx(models.AbstractModel): "credit_formula": credit_formula, "bal_formula": bal_formula, }, - default_format=self.format_theader_yellow_left, + default_format=FORMATS["format_theader_yellow_left"], ) diff --git a/account_move_line_report_xls/tests/test_aml_report_xlsx.py b/account_move_line_report_xls/tests/test_aml_report_xlsx.py index 711e0dfc..ed7a4521 100644 --- a/account_move_line_report_xls/tests/test_aml_report_xlsx.py +++ b/account_move_line_report_xls/tests/test_aml_report_xlsx.py @@ -28,5 +28,5 @@ class TestAmlReportXlsx(TransactionCase): self.amls = am.line_ids def test_aml_report_xlsx(self): - report_xls = self.report.render_xlsx(self.amls.ids, None) + report_xls = self.report._render_xlsx(self.amls.ids, None) self.assertEqual(report_xls[1], "xlsx")