From 31057dc1818b89a2e19c3ae5e673c7af5b689c06 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Wed, 18 Dec 2013 21:08:12 +0100 Subject: [PATCH 1/4] add account_journal_report_xls --- account_journal_report_xls/__init__.py | 27 ++ account_journal_report_xls/__openerp__.py | 57 ++++ account_journal_report_xls/account_journal.py | 83 +++++ account_journal_report_xls/i18n/fr.po | 256 ++++++++++++++ account_journal_report_xls/i18n/nl.po | 256 ++++++++++++++ account_journal_report_xls/report/__init__.py | 27 ++ .../report/nov_account_journal.py | 292 ++++++++++++++++ .../report/nov_account_journal.rml | 286 ++++++++++++++++ .../report/nov_account_journal_xls.py | 315 ++++++++++++++++++ .../static/src/img/icon.png | Bin 0 -> 15230 bytes account_journal_report_xls/wizard/__init__.py | 25 ++ .../wizard/print_journal_wizard.py | 171 ++++++++++ .../wizard/print_journal_wizard.xml | 80 +++++ 13 files changed, 1875 insertions(+) create mode 100644 account_journal_report_xls/__init__.py create mode 100644 account_journal_report_xls/__openerp__.py create mode 100644 account_journal_report_xls/account_journal.py create mode 100644 account_journal_report_xls/i18n/fr.po create mode 100644 account_journal_report_xls/i18n/nl.po create mode 100644 account_journal_report_xls/report/__init__.py create mode 100644 account_journal_report_xls/report/nov_account_journal.py create mode 100644 account_journal_report_xls/report/nov_account_journal.rml create mode 100644 account_journal_report_xls/report/nov_account_journal_xls.py create mode 100644 account_journal_report_xls/static/src/img/icon.png create mode 100644 account_journal_report_xls/wizard/__init__.py create mode 100644 account_journal_report_xls/wizard/print_journal_wizard.py create mode 100644 account_journal_report_xls/wizard/print_journal_wizard.xml diff --git a/account_journal_report_xls/__init__.py b/account_journal_report_xls/__init__.py new file mode 100644 index 00000000..87345508 --- /dev/null +++ b/account_journal_report_xls/__init__.py @@ -0,0 +1,27 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# +# Copyright (c) 2013 Noviat nv/sa (www.noviat.com). All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from . import account_journal +from . import wizard +from . import report + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/account_journal_report_xls/__openerp__.py b/account_journal_report_xls/__openerp__.py new file mode 100644 index 00000000..8cbcb1f7 --- /dev/null +++ b/account_journal_report_xls/__openerp__.py @@ -0,0 +1,57 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# +# Copyright (c) 2013 Noviat nv/sa (www.noviat.com). All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +{ + 'name': 'Financial Journal reports', + 'version': '0.1', + 'license': 'AGPL-3', + 'author': 'Noviat', + 'category' : 'Accounting & Finance', + 'description': """ + +Journal Reports +=============== + +This module adds journal reports by period and by fiscal year with + - entries printed per move + - option to group entries with same general account & VAT case + - vat info per entry + - vat summary + +These reports are available in PDF and XLS format. + +If you are installing this module manually, you need also the module 'report_xls', that is located in: +https://launchpad.net/openerp-reporting-engines" + + """, + 'depends': [ + 'account_voucher', + 'report_xls' + ], + 'demo_xml': [], + 'init_xml': [], + 'update_xml' : [ + 'wizard/print_journal_wizard.xml', + ], +} + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/account_journal_report_xls/account_journal.py b/account_journal_report_xls/account_journal.py new file mode 100644 index 00000000..649e4360 --- /dev/null +++ b/account_journal_report_xls/account_journal.py @@ -0,0 +1,83 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# +# Copyright (c) 2013 Noviat nv/sa (www.noviat.com). All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from openerp.osv import orm +from openerp.addons.report_xls.utils import rowcol_to_cell, _render +from openerp.tools.translate import _ + +class account_journal(orm.Model): + _inherit = 'account.journal' + + # allow inherited modules to extend the query + def _report_xls_query_extra(self, cr, uid, context=None): + select_extra = "" + join_extra = "" + where_extra = "" + return [select_extra, join_extra, where_extra] + + # allow inherited modules to add document references + def _report_xls_document_extra(self, cr, uid, context): + return "''" + + # override list in inherited module to add/drop columns or change order + def _report_xls_fields(self, cr, uid, context=None): + res = [ + 'move_name', # account.move,name + 'move_date', # account.move,date + 'acc_code', # account.account,code + ] + if context.get('print_by') == 'fiscalyear': + res += [ + 'period', # account.period,code or name + ] + res += [ + 'partner_name', # res.partner,name + 'aml_name', # account.move.line,name + 'tax_code', # account.tax.code,code + 'tax_amount', # account.move.line,tax_amount + 'debit', # account.move.line,debit + 'credit', # account.move.line,credit + 'balance', # debit-credit + 'docname', # origin document if any + #'date_maturity', # account.move.line,date_maturity + #'reconcile', # account.move.line,reconcile_id.name + #'reconcile_partial', # account.move.line,reconcile_partial_id.name + #'partner_ref', # res.partner,ref + #'move_ref', # account.move,ref + #'move_id', # account.move,id + ] + return res + + # Change/Add Template entries + def _report_xls_template(self, cr, uid, context=None): + """ + Template updates, e.g. + + my_change = { + 'move_name':{ + 'header': [1, 20, 'text', _('My Move Title')], + 'lines': [1, 0, 'text', _render("l['move_name'] != '/' and l['move_name'] or ('*'+str(l['move_id']))")], + 'totals': [1, 0, 'text', None]}, + } + return my_change + """ + return {} diff --git a/account_journal_report_xls/i18n/fr.po b/account_journal_report_xls/i18n/fr.po new file mode 100644 index 00000000..eec93f28 --- /dev/null +++ b/account_journal_report_xls/i18n/fr.po @@ -0,0 +1,256 @@ +# French translation of OpenERP Server 6.1. +# This file contains the translation of the following modules: +# * account_journal_report_xls +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 6.1\n" +"Report-Msgid-Bugs-To: support@noviat.be\n" +"POT-Creation-Date: 2013-11-23 17:11:14.941000\n" +"PO-Revision-Date: 2013-11-23 17:11:14.941000\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_journal_report_xls +#: model:ir.actions.act_window,name:account_journal_report_xls.action_print_journal_by_period_xls +msgid "Journal by Period" +msgstr "Journal détaillé par période" + +#. module: account_journal_report_xls +#: model:ir.actions.act_window,name:account_journal_report_xls.action_print_journal_by_fiscalyear_xls +msgid "Journal by Fiscal Year" +msgstr "Journal détaillé par exercice fiscal" + +#. module: account_journal_report_xls +#: model:ir.ui.menu,name:account_journal_report_xls.menu_print_journal_by_period_xls +msgid "Journal by Period" +msgstr "Journal détaillé par période" + +#. module: account_journal_report_xls +#: model:ir.ui.menu,name:account_journal_report_xls.menu_print_journal_by_fiscalyear_xls +msgid "Journal by Fiscal Year" +msgstr "Journal détaillé par exercice fiscal" + +#. module: account_journal_report_xls +#: field:account.print.journal.xls,chart_account_id:0 +msgid "Chart of Account" +msgstr "Plan comptable" + +#. module: account_journal_report_xls +#: field:account.print.journal.xls,fiscalyear_id:0 +msgid "Fiscal Year" +msgstr "Exercice fiscal" + +#. module: account_journal_report_xls +#: field:account.print.journal.xls,target_move:0 +msgid "Target Moves" +msgstr "Mouvements ciblés" + +#. module: account_journal_report_xls +#: selection:account.print.journal.xls,target_move:0 +msgid "All Posted Entries" +msgstr "Toutes les écritures passées" + +#. module: account_journal_report_xls +#: selection:account.print.journal.xls,target_move:0 +msgid "All Entries" +msgstr "Toutes les écritures" + +#. module: account_journal_report_xls +#: field:account.print.journal.xls,sort_selection:0 +msgid "Entries Sorted by" +msgstr "Écritures triées par" + +#. module: account_journal_report_xls +#: selection:account.print.journal.xls,sort_selection:0 +msgid "Journal Entry Number" +msgstr "N° écriture dans le journal" + +#. module: account_journal_report_xls +#: selection:account.print.journal.xls,sort_selection:0 +msgid "Date" +msgstr "Date" + +#. module: account_journal_report_xls +#: field:account.print.journal.xls,amount_currency:0 +msgid "With Currency" +msgstr "Avec devise" + +#. module: account_journal_report_xls +#: field:account.print.journal.xls,group_entries:0 +msgid "Group Entries" +msgstr "Group Entries" + +#. module: account_journal_report_xls +#: field:account.print.journal.xls,period_from:0 +msgid "Start Period" +msgstr "Première période" + +#. module: account_journal_report_xls +#: field:account.print.journal.xls,period_to:0 +msgid "End Period" +msgstr "Dernière période" + +#. module: account_journal_report_xls +#: code:addons/account_journal_report_xls/wizard/print_journal_wizard.py:10 +msgid "No records found for your selection!" +msgstr "Aucun enregistrement trouvé pour votre sélection!" + +#. module: account_journal_report_xls +#: code:addons/account_journal_report_xls/wizard/print_journal_wizard.py:11 +msgid "No Data Available" +msgstr "Aucune donnée disponible" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Period" +msgstr "Période" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Fiscal Year" +msgstr "Exercice fiscal" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Journal Overview" +msgstr "Journal détaillé" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Entry" +msgstr "Écriture" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Date" +msgstr "Date" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Account" +msgstr "Compte" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Description" +msgstr "Description" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Partner" +msgstr "Partenaire" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Partner Reference" +msgstr "Réf. Partenaire" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Maturity Date" +msgstr "Date d'échéance" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Debit" +msgstr "Débit" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Credit" +msgstr "Crédit" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Balance" +msgstr "Solde" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Rec." +msgstr "Let." + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Part. Rec." +msgstr "Let. Part." + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "VAT" +msgstr "TVA" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "VAT Amount" +msgstr "Montant TVA" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Amount" +msgstr "Montant" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Currency" +msgstr "Devise" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Am. Currency" +msgstr "Montant devise" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Curr." +msgstr "Dev." + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Document" +msgstr "Document" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Entry Reference" +msgstr "Écriture réf." + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Entry Id" +msgstr "Écriture id" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "VAT Declaration" +msgstr "Déclaration TVA" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Case" +msgstr "Case" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Invoice" +msgstr "Facture" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Voucher" +msgstr "Voucher" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Statement" +msgstr "Relevé" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Grouped Entries" +msgstr "Écritures groupées" + diff --git a/account_journal_report_xls/i18n/nl.po b/account_journal_report_xls/i18n/nl.po new file mode 100644 index 00000000..502febcf --- /dev/null +++ b/account_journal_report_xls/i18n/nl.po @@ -0,0 +1,256 @@ +# Dutch translation of OpenERP Server 6.1. +# This file contains the translation of the following modules: +# * account_journal_report_xls +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 6.1\n" +"Report-Msgid-Bugs-To: support@noviat.be\n" +"POT-Creation-Date: 2013-11-23 17:11:14.936000\n" +"PO-Revision-Date: 2013-11-23 17:11:14.936000\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_journal_report_xls +#: model:ir.actions.act_window,name:account_journal_report_xls.action_print_journal_by_period_xls +msgid "Journal by Period" +msgstr "Dagboekoverzicht per periode" + +#. module: account_journal_report_xls +#: model:ir.actions.act_window,name:account_journal_report_xls.action_print_journal_by_fiscalyear_xls +msgid "Journal by Fiscal Year" +msgstr "Dagboekoverzicht per boekjaar" + +#. module: account_journal_report_xls +#: model:ir.ui.menu,name:account_journal_report_xls.menu_print_journal_by_period_xls +msgid "Journal by Period" +msgstr "Dagboekoverzicht per periode" + +#. module: account_journal_report_xls +#: model:ir.ui.menu,name:account_journal_report_xls.menu_print_journal_by_fiscalyear_xls +msgid "Journal by Fiscal Year" +msgstr "Dagboekoverzicht per boekjaar" + +#. module: account_journal_report_xls +#: field:account.print.journal.xls,chart_account_id:0 +msgid "Chart of Account" +msgstr "Rekeningschema" + +#. module: account_journal_report_xls +#: field:account.print.journal.xls,fiscalyear_id:0 +msgid "Fiscal Year" +msgstr "Boekjaar" + +#. module: account_journal_report_xls +#: field:account.print.journal.xls,target_move:0 +msgid "Target Moves" +msgstr "Boekingen" + +#. module: account_journal_report_xls +#: selection:account.print.journal.xls,target_move:0 +msgid "All Posted Entries" +msgstr "Alle goedgekeurde boekingen" + +#. module: account_journal_report_xls +#: selection:account.print.journal.xls,target_move:0 +msgid "All Entries" +msgstr "Alle boekingen" + +#. module: account_journal_report_xls +#: field:account.print.journal.xls,sort_selection:0 +msgid "Entries Sorted by" +msgstr "Boekingen gesorteerd op" + +#. module: account_journal_report_xls +#: selection:account.print.journal.xls,sort_selection:0 +msgid "Journal Entry Number" +msgstr "Nummer journaalpost" + +#. module: account_journal_report_xls +#: selection:account.print.journal.xls,sort_selection:0 +msgid "Date" +msgstr "Datum" + +#. module: account_journal_report_xls +#: field:account.print.journal.xls,amount_currency:0 +msgid "With Currency" +msgstr "Met valuta" + +#. module: account_journal_report_xls +#: field:account.print.journal.xls,group_entries:0 +msgid "Group Entries" +msgstr "Groepeer dagboekregels" + +#. module: account_journal_report_xls +#: field:account.print.journal.xls,period_from:0 +msgid "Start Period" +msgstr "Beginperiode" + +#. module: account_journal_report_xls +#: field:account.print.journal.xls,period_to:0 +msgid "End Period" +msgstr "Eindperiode" + +#. module: account_journal_report_xls +#: code:addons/account_journal_report_xls/wizard/print_journal_wizard.py:10 +msgid "No records found for your selection!" +msgstr "Geen records gevonden voor uw keuze!" + +#. module: account_journal_report_xls +#: code:addons/account_journal_report_xls/wizard/print_journal_wizard.py:11 +msgid "No Data Available" +msgstr "Geen gegevens beschikbaar" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Period" +msgstr "Periode" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Fiscal Year" +msgstr "Boekjaar" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Journal Overview" +msgstr "Dagboekoverzicht" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Entry" +msgstr "Boeking" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Date" +msgstr "Datum" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Account" +msgstr "Rekening" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Description" +msgstr "Omschrijving" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Partner" +msgstr "Partner" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Partner Reference" +msgstr "Ref. Partner" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Maturity Date" +msgstr "Vervaldatum" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Debit" +msgstr "Debet" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Credit" +msgstr "Credit" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Balance" +msgstr "Saldo" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Rec." +msgstr "Rec." + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Part. Rec." +msgstr "Rec. Part." + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "VAT" +msgstr "BTW" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "VAT Amount" +msgstr "Bedrag BTW" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Amount" +msgstr "Bedrag" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Currency" +msgstr "Valuta" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Am. Currency" +msgstr "Bedrag valuta" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Curr." +msgstr "Val." + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Document" +msgstr "Document" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Entry Reference" +msgstr "Boeking ref." + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Entry Id" +msgstr "Boeking id" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "VAT Declaration" +msgstr "BTW aangifte" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Case" +msgstr "Vak" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Invoice" +msgstr "Factuur" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Voucher" +msgstr "Voucher" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Statement" +msgstr "Uitreksel" + +#. module: account_journal_report_xls +#: report:nov.account.journal.print:0 +msgid "Grouped Entries" +msgstr "Gegroepeerde boekingsregels" + diff --git a/account_journal_report_xls/report/__init__.py b/account_journal_report_xls/report/__init__.py new file mode 100644 index 00000000..c08b6513 --- /dev/null +++ b/account_journal_report_xls/report/__init__.py @@ -0,0 +1,27 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# +# Copyright (c) 2013 Noviat nv/sa (www.noviat.com). All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +import nov_account_journal +import nov_account_journal_xls + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/account_journal_report_xls/report/nov_account_journal.py b/account_journal_report_xls/report/nov_account_journal.py new file mode 100644 index 00000000..5de8c6a4 --- /dev/null +++ b/account_journal_report_xls/report/nov_account_journal.py @@ -0,0 +1,292 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# +# Copyright (c) 2013 Noviat nv/sa (www.noviat.com). All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +import time +from openerp.report import report_sxw +from openerp.tools.translate import translate, _ +import logging +_logger = logging.getLogger(__name__) + +_ir_translation_name = 'nov.account.journal.print' + +class nov_journal_print(report_sxw.rml_parse): + + def set_context(self, objects, data, ids, report_type=None): + #_logger.warn('set_context, objects = %s, data = %s, ids = %s', objects, data, ids) + super(nov_journal_print, self).set_context(objects, data, ids) + j_obj = self.pool.get('account.journal') + p_obj = self.pool.get('account.period') + fy_obj = self.pool.get('account.fiscalyear') + self.sort_selection = data['sort_selection'] + if data['target_move'] == 'posted': + self.move_states = ['posted'] + else: + self.move_states = ['draft','posted'] + self.display_currency = self.localcontext['display_currency'] = data['display_currency'] + self.group_entries = data['group_entries'] + self.print_by = data['print_by'] + self.report_type = report_type + if self.print_by == 'period': + journal_period_ids = data['journal_period_ids'] + objects = [] + for jp in journal_period_ids: + journal = j_obj.browse(self.cr, self.uid, jp[0], self.context) + periods = p_obj.browse(self.cr, self.uid, jp[1], self.context) + objects.extend([(journal, period) for period in periods]) + self.localcontext['objects'] = self.objects = objects + else: + journal_fy_ids = data['journal_fy_ids'] + objects = [] + for jf in journal_fy_ids: + journal = j_obj.browse(self.cr, self.uid, jf[0], self.context) + fiscalyear = fy_obj.browse(self.cr, self.uid, jf[1], self.context) + objects.append((journal, fiscalyear)) + self.localcontext['objects'] = self.objects = objects + + def __init__(self, cr, uid, name, context): + if context is None: + context = {} + super(nov_journal_print, self).__init__(cr, uid, name, context=context) + self.localcontext.update({ + 'time': time, + 'title': self._title, + 'amount_title': self._amount_title, + 'lines': self._lines, + 'sum1': self._sum1, + 'sum2': self._sum2, + 'tax_codes': self._tax_codes, + 'sum_vat': self._sum_vat, + '_': self._, + }) + self.context = context + + def _(self, src): + lang = self.context.get('lang', 'en_US') + return translate(self.cr, _ir_translation_name, 'report', lang, src) or src + + def _title(self, object): + return ((self.print_by == 'period' and self._('Period') or self._('Fiscal Year')) + ' ' + object[1].name, object[0].name) + + def _amount_title(self): + return self.display_currency and (self._('Amount'), self._('Currency')) or (self._('Debit'), self._('Credit')) + + def _lines(self, object): + j_obj = self.pool.get('account.journal') + _ = self._ + journal = object[0] + journal_id = journal.id + if self.print_by == 'period': + period = object[1] + period_id = period.id + period_ids = [period_id] + # update status period + ids_journal_period = self.pool.get('account.journal.period').search(self.cr, self.uid, + [('journal_id', '=', journal_id), ('period_id', '=', period_id)]) + if ids_journal_period: + self.cr.execute( + 'update account_journal_period set state=%s where journal_id=%s and period_id=%s and state=%s', + ('printed', journal_id, period_id, 'draft') + ) + else: + self.pool.get('account.journal.period').create(self.cr, self.uid, { + 'name': (journal.code or journal.name)+':'+(period.name or ''), + 'journal_id': journal.id, + 'period_id': period.id, + 'state': 'printed', + }) + _logger.error("The Entry for Period '%s', Journal '%s' was missing in 'account.journal.period' and has been fixed now !", + period.name, journal.name) + else: + fiscalyear = object[1] + period_ids = [x.id for x in fiscalyear.period_ids] + + select_extra, join_extra, where_extra = j_obj._report_xls_query_extra(self.cr, self.uid, self.context) + + self.cr.execute("SELECT l.move_id AS move_id, l.id AS aml_id, " \ + "am.name AS move_name, coalesce(am.ref,'') AS move_ref, am.date AS move_date, " \ + "aa.id AS account_id, aa.code AS acc_code, " \ + "coalesce(rp.name,'') AS partner_name, coalesce(rp.ref,'') AS partner_ref, rp.id AS partner_id, " \ + "coalesce(l.name,'') AS aml_name, " \ + "l.date_maturity AS date_maturity, " \ + "coalesce(ap.code, ap.name) AS period, " \ + "coalesce(atc.code,'') AS tax_code, atc.id AS tax_code_id, coalesce(l.tax_amount,0.0) AS tax_amount, " \ + "coalesce(l.debit,0.0) AS debit, coalesce(l.credit,0.0) AS credit, " \ + "coalesce(amr.name,'') AS reconcile, coalesce(amrp.name,'') AS reconcile_partial, " \ + "coalesce(l.amount_currency,0.0) AS amount_currency, " \ + "rc.id AS currency_id, rc.name AS currency_name, rc.symbol AS currency_symbol, " \ + "coalesce(ai.internal_number,'-') AS inv_number, coalesce(abs.name,'-') AS st_number, coalesce(av.number,'-') AS voucher_number " \ + + select_extra + \ + "FROM account_move_line l " \ + "INNER JOIN account_move am ON l.move_id = am.id " \ + "INNER JOIN account_account aa ON l.account_id = aa.id " \ + "INNER JOIN account_period ap ON l.period_id = ap.id " \ + "LEFT OUTER JOIN account_invoice ai ON ai.move_id = am.id " \ + "LEFT OUTER JOIN account_voucher av ON av.move_id = am.id " \ + "LEFT OUTER JOIN account_bank_statement abs ON l.statement_id = abs.id " \ + "LEFT OUTER JOIN res_partner rp ON l.partner_id = rp.id " \ + "LEFT OUTER JOIN account_tax_code atc ON l.tax_code_id = atc.id " \ + "LEFT OUTER JOIN account_move_reconcile amr ON l.reconcile_id = amr.id " \ + "LEFT OUTER JOIN account_move_reconcile amrp ON l.reconcile_partial_id = amrp.id " \ + "LEFT OUTER JOIN res_currency rc ON l.currency_id = rc.id " \ + + join_extra + \ + "WHERE l.period_id IN %s AND l.journal_id = %s " \ + "AND am.state IN %s " \ + + where_extra + \ + "ORDER BY " + self.sort_selection + ", move_date, move_id, acc_code", + (tuple(period_ids), journal_id, tuple(self.move_states)) + ) + lines = self.cr.dictfetchall() + + # add reference of corresponding origin document + if journal.type in ['sale', 'sale_refund', 'purchase', 'purchase_refund']: + map(lambda x: x.update({'docname' : (_('Invoice') + ': ' + x['inv_number']) or (_('Voucher') + ': ' + x['voucher_number']) or '-'}), lines) + elif journal.type in ['bank', 'cash']: + map(lambda x: x.update({'docname' : (_('Statement') + ': ' + x['st_number']) or (_('Voucher') + ': ' + x['voucher_number']) or '-'}), lines) + else: + code_string = j_obj._report_xls_document_extra(self.cr, self.uid, self.context) + #_logger.warn('code_string= %s', code_string) + map(lambda x: x.update({'docname' : eval(code_string) or '-'}), lines) + + # format debit, credit, amount_currency for pdf report + if self.display_currency and self.report_type == 'pdf': + curr_obj = self.pool.get('res.currency') + map(lambda x: x.update({ + 'amount1': self.formatLang(x['debit']-x['credit']), + 'amount2': self.formatLang(x['amount_currency'], monetary=True, currency_obj=curr_obj.browse(self.cr, self.uid, x['currency_id'])) + }), lines) + else: + map(lambda x: x.update({'amount1': self.formatLang(x['debit']), 'amount2': self.formatLang(x['credit'])}), lines) + + # group lines + if self.group_entries: + lines = self._group_lines(lines) + + # insert a flag in every move_line to indicate the end of a move + # this flag will be used to draw a full line between moves + for cnt in range(len(lines)-1): + if lines[cnt]['move_id'] <> lines[cnt+1]['move_id']: + lines[cnt]['draw_line'] = 1 + else: + lines[cnt]['draw_line'] = 0 + lines[-1]['draw_line'] = 1 + + return lines + + def _group_lines(self, lines_in): + + _ = self._ + + def group_move(lines_in): + if len(lines_in) == 1: + return lines_in + lines_grouped = {} + for line in lines_in: + key = (line['account_id'], line['tax_code_id'], line['partner_id']) + if not key in lines_grouped: + lines_grouped[key] = line + else: + lines_grouped[key]['debit'] += line['debit'] + lines_grouped[key]['credit'] += line['credit'] + lines_grouped[key]['tax_amount'] += line['tax_amount'] + lines_grouped[key]['aml_name'] = _('Grouped Entries') + lines_out = lines_grouped.values() + lines_out.sort(key=lambda x:x['acc_code']) + return lines_out + + lines_out = [] + grouped_lines = [lines_in[0]] + move_id = lines_in[0]['move_id'] + line_cnt = len(lines_in) + for i in range(1,line_cnt): + line = lines_in[i] + if line['move_id'] == move_id: + grouped_lines.append(line) + if i == line_cnt-1: + lines_out += group_move(grouped_lines) + else: + lines_out += group_move(grouped_lines) + grouped_lines = [line] + move_id = line['move_id'] + + return lines_out + + def _tax_codes(self, object): + journal_id = object[0].id + if self.print_by == 'period': + period_id = object[1].id + period_ids = [period_id] + else: + fiscalyear = object[1] + period_ids = [x.id for x in fiscalyear.period_ids] + self.cr.execute( + "SELECT distinct tax_code_id FROM account_move_line l " \ + "INNER JOIN account_move am ON l.move_id = am.id " \ + "WHERE l.period_id in %s AND l.journal_id=%s AND l.tax_code_id IS NOT NULL AND am.state IN %s", + (tuple(period_ids), journal_id, tuple(self.move_states))) + ids = map(lambda x: x[0], self.cr.fetchall()) + if ids: + self.cr.execute('SELECT id FROM account_tax_code WHERE id IN %s ORDER BY code', (tuple(ids),)) + tax_code_ids = map(lambda x: x[0], self.cr.fetchall()) + else: + tax_code_ids = [] + tax_codes = self.pool.get('account.tax.code').browse(self.cr, self.uid, tax_code_ids, self.context) + return tax_codes + + def _totals(self, field, object, tax_code_id=None): + journal_id = object[0].id + if self.print_by == 'period': + period_id = object[1].id + period_ids = [period_id] + else: + fiscalyear = object[1] + period_ids = [x.id for x in fiscalyear.period_ids] + select = "SELECT sum(" + field + ") FROM account_move_line l " \ + "INNER JOIN account_move am ON l.move_id = am.id " \ + "WHERE l.period_id IN %s AND l.journal_id=%s AND am.state IN %s" + if field == 'tax_amount': + select += " AND tax_code_id=%s" %tax_code_id + self.cr.execute(select, (tuple(period_ids), journal_id, tuple(self.move_states))) + return self.cr.fetchone()[0] or 0.0 + + def _sum1(self, object): + return self._totals('debit', object) + + def _sum2(self, object): + if self.display_currency: + return '' + else: + return self._totals('credit', object) + + def _sum_vat(self, object, tax_code): + return self._totals('tax_amount', object, tax_code.id) + + def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False, dp=False, currency_obj=False): + if isinstance(value, (float, int)) and not value: + return '' + else: + return super(nov_journal_print, self).formatLang(value, digits, date, date_time, grouping, monetary, dp, currency_obj) + +report_sxw.report_sxw('report.nov.account.journal.print', 'account.journal', + 'addons/account_journal_report_xls/report/nov_account_journal.rml', + parser=nov_journal_print, header=False) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/account_journal_report_xls/report/nov_account_journal.rml b/account_journal_report_xls/report/nov_account_journal.rml new file mode 100644 index 00000000..48070b70 --- /dev/null +++ b/account_journal_report_xls/report/nov_account_journal.rml @@ -0,0 +1,286 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ [[ repeatIn(objects, 'o') ]] +
+ + [[ o!=objects[0] and ' ' or removeParentNode('section') ]] +
+ + + + [[ company.name ]] + + + [[ title(o)[0] ]] + + + [[ title(o)[1] ]] + + + Journal Overview [[ '- ' + company.currency_id.name ]] + + + + + + + + + + + + + + + + + + + + + [[ formatLang(sum1(o)) ]] + + + + + [[ formatLang(sum2(o)) ]] + + + + + + + + + + + + + + + + + Entry + + + Date + + + Account + + + Partner + + + Description + + + VAT + + + [[ amount_title()[0] ]] + + + [[ amount_title()[1] ]] + + + +
+ [[ repeatIn(lines(o), 'l') ]] + + + + [[ l['move_name'] != '/' and l['move_name'] or ('*'+str(l['move_id'])) ]] + + + [[ l['move_date'] ]] + + + [[ l['acc_code'] ]] + + + [[ l['partner_name'] ]] + + + [[ l['aml_name'] ]] + + + [[ l['tax_code'] and (l['tax_code'] + ':') ]] + + + [[ l['tax_code'] and formatLang(l['tax_amount']) ]] + + + [[ l['amount1'] ]] + + + [[ l['amount2'] ]] + + + + + + + [[ l['draw_line'] and removeParentNode('blockTable') ]] + + + + + + + [[ not l['draw_line'] and removeParentNode('blockTable') ]] + + + +
+ + + + + + + VAT Declaration + + + + + + +
+ [[ repeatIn(tax_codes(o), 't') ]] + + + + [[ t.code + ': ' ]] + + + [[ formatLang(sum_vat(o,t)) ]] + + + + + + + + [[ t.name ]] + + + +
+
+ + + diff --git a/account_journal_report_xls/report/nov_account_journal_xls.py b/account_journal_report_xls/report/nov_account_journal_xls.py new file mode 100644 index 00000000..f03d0727 --- /dev/null +++ b/account_journal_report_xls/report/nov_account_journal_xls.py @@ -0,0 +1,315 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# +# Copyright (c) 2013 Noviat nv/sa (www.noviat.com). All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +import xlwt +import time +from datetime import datetime +from openerp.osv import orm +from openerp.report import report_sxw +from openerp.addons.report_xls.report_xls import report_xls +from openerp.addons.report_xls.utils import rowcol_to_cell, _render +from .nov_account_journal import nov_journal_print +from openerp.tools.translate import _ +import logging +_logger = logging.getLogger(__name__) + +class account_journal_xls_parser(nov_journal_print): + + def __init__(self, cr, uid, name, context): + super(account_journal_xls_parser, self).__init__(cr, uid, name, context=context) + journal_obj = self.pool.get('account.journal') + self.context = context + wanted_list = journal_obj._report_xls_fields(cr, uid, context) + template_changes = journal_obj._report_xls_template(cr, uid, context) + self.localcontext.update({ + 'datetime': datetime, + 'wanted_list': wanted_list, + 'template_changes': template_changes, + }) + +class account_journal_xls(report_xls): + + def __init__(self, name, table, rml=False, parser=False, header=True, store=False): + super(account_journal_xls, self).__init__(name, table, rml, parser, header, store) + + # Cell Styles + _xs = self.xls_styles + # header + rh_cell_format = _xs['bold'] + _xs['fill'] + _xs['borders_all'] + self.rh_cell_style = xlwt.easyxf(rh_cell_format) + self.rh_cell_style_center = xlwt.easyxf(rh_cell_format + _xs['center']) + self.rh_cell_style_right = xlwt.easyxf(rh_cell_format + _xs['right']) + # lines + aml_cell_format = _xs['borders_all'] + self.aml_cell_style = xlwt.easyxf(aml_cell_format) + self.aml_cell_style_center = xlwt.easyxf(aml_cell_format + _xs['center']) + self.aml_cell_style_date = xlwt.easyxf(aml_cell_format + _xs['left'], num_format_str = report_xls.date_format) + self.aml_cell_style_decimal = xlwt.easyxf(aml_cell_format + _xs['right'], num_format_str = report_xls.decimal_format) + # totals + rt_cell_format = _xs['bold'] + _xs['fill'] + _xs['borders_all'] + self.rt_cell_style = xlwt.easyxf(rt_cell_format) + self.rt_cell_style_right = xlwt.easyxf(rt_cell_format + _xs['right']) + self.rt_cell_style_decimal = xlwt.easyxf(rt_cell_format + _xs['right'], num_format_str = report_xls.decimal_format) + + # XLS Template Journal Items + self.col_specs_lines_template = { + 'move_name':{ + 'header': [1, 20, 'text', _render("_('Entry')")], + 'lines': [1, 0, 'text', _render("l['move_name'] != '/' and l['move_name'] or ('*'+str(l['move_id']))")], + 'totals': [1, 0, 'text', None]}, + 'move_date':{ + 'header': [1, 13, 'text', _render("_('Date')")], + 'lines': [1, 0, 'date', _render("datetime.strptime(l['move_date'],'%Y-%m-%d')"), None, self.aml_cell_style_date], + 'totals': [1, 0, 'text', None]}, + 'acc_code':{ + 'header': [1, 12, 'text', _render("_('Account')")], + 'lines': [1, 0, 'text', _render("l['acc_code']")], + 'totals': [1, 0, 'text', None]}, + 'aml_name':{ + 'header': [1, 42, 'text', _render("_('Description')")], + 'lines': [1, 0, 'text', _render("l['aml_name']")], + 'totals': [1, 0, 'text', None]}, + 'period':{ + 'header': [1, 12, 'text', _render("_('Period')")], + 'lines': [1, 0, 'text', _render("l['period']")], + 'totals': [1, 0, 'text', None]}, + 'partner_name':{ + 'header': [1, 36, 'text', _render("_('Partner')")], + 'lines': [1, 0, 'text', _render("l['partner_name']")], + 'totals': [1, 0, 'text', None]}, + 'partner_ref':{ + 'header': [1, 36, 'text', _render("_('Partner Reference')")], + 'lines': [1, 0, 'text', _render("l['partner_ref']")], + 'totals': [1, 0, 'text', None]}, + 'date_maturity':{ + 'header': [1, 13, 'text', _render("_('Maturity Date')")], + 'lines': [1, 0, _render("l['date_maturity'] and 'date' or 'text'"), + _render("l['date_maturity'] and datetime.strptime(l['date_maturity'],'%Y-%m-%d') or None"), + None, self.aml_cell_style_date], + 'totals': [1, 0, 'text', None]}, + 'debit':{ + 'header': [1, 18, 'text', _render("_('Debit')"), None, self.rh_cell_style_right], + 'lines': [1, 0, 'number', _render("l['debit']"), None, self.aml_cell_style_decimal], + 'totals': [1, 0, 'number', None, _render("debit_formula"), self.rt_cell_style_decimal]}, + 'credit':{ + 'header': [1, 18, 'text', _render("_('Credit')"), None, self.rh_cell_style_right], + 'lines': [1, 0, 'number', _render("l['credit']"), None, self.aml_cell_style_decimal], + 'totals': [1, 0, 'number', None, _render("credit_formula"), self.rt_cell_style_decimal]}, + 'balance':{ + 'header': [1, 18, 'text', _render("_('Balance')"), None, self.rh_cell_style_right], + 'lines': [1, 0, 'number', None, _render("bal_formula"), self.aml_cell_style_decimal], + 'totals': [1, 0, 'number', None, _render("bal_formula"), self.rt_cell_style_decimal]}, + 'reconcile':{ + 'header': [1, 12, 'text', _render("_('Rec.')"), None, self.rh_cell_style_center], + 'lines': [1, 0, 'text', _render("l['reconcile']"), None, self.aml_cell_style_center], + 'totals': [1, 0, 'text', None]}, + 'reconcile_partial':{ + 'header': [1, 12, 'text', _render("_('Part. Rec.')"), None, self.rh_cell_style_center], + 'lines': [1, 0, 'text', _render("l['reconcile_partial']"), None, self.aml_cell_style_center], + 'totals': [1, 0, 'text', None]}, + 'tax_code':{ + 'header': [1, 6, 'text', _render("_('VAT')"), None, self.rh_cell_style_center], + 'lines': [1, 0, 'text', _render("l['tax_code']"), None, self.aml_cell_style_center], + 'totals': [1, 0, 'text', None]}, + 'tax_amount':{ + 'header': [1, 18, 'text', _render("_('VAT Amount')"), None, self.rh_cell_style_right], + 'lines': [1, 0, 'number', _render("l['tax_amount']"), None, self.aml_cell_style_decimal], + 'totals': [1, 0, 'text', None]}, + 'amount_currency':{ + 'header': [1, 18, 'text', _render("_('Am. Currency')"), None, self.rh_cell_style_right], + 'lines': [1, 0, _render("l['amount_currency'] and 'number' or 'text'"), + _render("l['amount_currency'] or None"), + None, self.aml_cell_style_decimal], + 'totals': [1, 0, 'text', None]}, + 'currency_name':{ + 'header': [1, 6, 'text', _render("_('Curr.')"), None, self.rh_cell_style_center], + 'lines': [1, 0, 'text', _render("l['currency_name']"), None, self.aml_cell_style_center], + 'totals': [1, 0, 'text', None]}, + 'docname':{ + 'header': [1, 35, 'text', _render("_('Document')")], + 'lines': [1, 0, 'text', _render("l['docname']")], + 'totals': [1, 0, 'text', None]}, + 'move_ref':{ + 'header': [1, 25, 'text', _render("_('Entry Reference')")], + 'lines': [1, 0, 'text', _render("l['move_ref']")], + 'totals': [1, 0, 'text', None]}, + 'move_id':{ + 'header': [1, 10, 'text', _render("_('Entry Id')")], + 'lines': [1, 0, 'text', _render("str(l['move_id'])")], + 'totals': [1, 0, 'text', None]}, + } + + # XLS Template VAT Summary + self.col_specs_vat_summary_template = { + 'tax_case_name':{ + 'header': [1, 45, 'text', _render("_('Description')")], + 'tax_totals': [1, 0, 'text', _render("t.name")]}, + 'tax_code':{ + 'header': [1, 6, 'text', _render("_('Case')")], + 'tax_totals': [1, 0, 'text', _render("t.code")]}, + 'tax_amount':{ + 'header': [1, 18, 'text', _render("_('Amount')"), None, self.rh_cell_style_right], + 'tax_totals': [1, 0, 'number', _render("sum_vat(o,t)"), None, self.aml_cell_style_decimal]}, + } + + def _journal_title(self, o, ws, _p, row_pos, xlwt, _xs): + cell_style = xlwt.easyxf(_xs['xls_title']) + report_name = (10*' ').join([ + _p.company.name, + _p.title(o)[0], + _p.title(o)[1], + _p._("Journal Overview") + ' - ' + _p.company.currency_id.name, + ]) + c_specs = [ + ('report_name', 1, 0, 'text', report_name), + ] + row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs]) + row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=cell_style) + return row_pos + 1 + + def _journal_lines(self, o, ws, _p, row_pos, xlwt, _xs): + + wanted_list = self.wanted_list + debit_pos = self.debit_pos + credit_pos = self.credit_pos + + # Column headers + c_specs = map(lambda x: self.render(x, self.col_specs_lines_template, 'header', render_space={'_': _p._}), wanted_list) + row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs]) + row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=self.rh_cell_style, set_column_size=True) + ws.set_horz_split_pos(row_pos) + + # account move lines + aml_start_pos = row_pos + aml_cnt = len(_p.lines(o)) + cnt = 0 + for l in _p.lines(o): + cnt += 1 + debit_cell = rowcol_to_cell(row_pos, debit_pos) + credit_cell = rowcol_to_cell(row_pos, credit_pos) + bal_formula = debit_cell + '-' + credit_cell + c_specs = map(lambda x: self.render(x, self.col_specs_lines_template, 'lines'), wanted_list) + row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs]) + row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=self.aml_cell_style) + if l['draw_line'] and cnt != aml_cnt: + row_pos += 1 + + # Totals + debit_start = rowcol_to_cell(aml_start_pos, debit_pos) + debit_stop = rowcol_to_cell(row_pos - 1, debit_pos) + debit_formula = 'SUM(%s:%s)' %(debit_start, debit_stop) + credit_start = rowcol_to_cell(aml_start_pos, credit_pos) + credit_stop = rowcol_to_cell(row_pos - 1, credit_pos) + credit_formula = 'SUM(%s:%s)' %(credit_start, credit_stop) + debit_cell = rowcol_to_cell(row_pos, debit_pos) + credit_cell = rowcol_to_cell(row_pos, credit_pos) + bal_formula = debit_cell + '-' + credit_cell + c_specs = map(lambda x: self.render(x, self.col_specs_lines_template, 'totals'), wanted_list) + row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs]) + row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=self.rt_cell_style_right) + return row_pos + 1 + + def _journal_vat_summary(self, o, ws, _p, row_pos, xlwt, _xs): + + if not _p.tax_codes(o): + return row_pos + + title_cell_style = xlwt.easyxf(_xs['bold']) + c_specs = [('summary_title', 1, 0, 'text', _p._("VAT Declaration"))] + row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs]) + row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=title_cell_style) + 1 + + wanted_list = self.wanted_list + vat_summary_wanted_list = ['tax_case_name', 'tax_code', 'tax_amount'] + + # calculate col_span + cols_number = len(wanted_list) + vat_summary_cols_number = len(vat_summary_wanted_list) + if vat_summary_cols_number > cols_number: + raise orm.except_orm(_('Programming Error!'), + _("vat_summary_cols_number should be < cols_number !")) + index = 0 + for i in range(vat_summary_cols_number): + col = vat_summary_wanted_list[i] + col_size = self.col_specs_lines_template[wanted_list[index]]['header'][1] + templ_col_size = self.col_specs_vat_summary_template[col]['header'][1] + #_logger.warn("col=%s, col_size=%s, templ_col_size=%s", col, col_size, templ_col_size) + col_span = 1 + if templ_col_size > col_size: + new_size = col_size + while templ_col_size > new_size: + col_span += 1 + index += 1 + new_size += self.col_specs_lines_template[wanted_list[index]]['header'][1] + self.col_specs_vat_summary_template[col]['header'][0] = col_span + self.col_specs_vat_summary_template[col]['tax_totals'][0] = col_span + index += 1 + + c_specs = map(lambda x: self.render(x, self.col_specs_vat_summary_template, 'header'), vat_summary_wanted_list) + row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs]) + row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=self.rh_cell_style) + + for t in _p.tax_codes(o): + c_specs = map(lambda x: self.render(x, self.col_specs_vat_summary_template, 'tax_totals'), vat_summary_wanted_list) + row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs]) + row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=self.aml_cell_style) + + return row_pos + + def generate_xls_report(self, _p, _xs, data, objects, wb): + + wanted_list = _p.wanted_list + if _p.display_currency: + wanted_list += ['amount_currency', 'currency_name'] + self.wanted_list = wanted_list + self.col_specs_lines_template.update(_p.template_changes) + + self.debit_pos = 'debit' in wanted_list and wanted_list.index('debit') + self.credit_pos = 'credit' in wanted_list and wanted_list.index('credit') + if not (self.credit_pos and self.debit_pos) and 'balance' in wanted_list: + raise orm.except_orm(_('Customisation Error!'), + _("The 'Balance' field is a calculated XLS field requiring the presence of the 'Debit' and 'Credit' fields !")) + + for o in objects: + + sheet_name = ' - '.join([o[1].code, o[0].code])[:31].replace('/', '-') + sheet_name = sheet_name[:31].replace('/', '-') + ws = wb.add_sheet(sheet_name) + ws.panes_frozen = True + ws.remove_splits = True + ws.portrait = 0 # Landscape + ws.fit_width_to_pages = 1 + row_pos = 0 + + # set print header/footer + ws.header_str = self.xls_headers['standard'] + ws.footer_str = self.xls_footers['standard'] + + # Data + row_pos = self._journal_title(o, ws, _p, row_pos, xlwt, _xs) + row_pos = self._journal_lines(o, ws, _p, row_pos, xlwt, _xs) + row_pos = self._journal_vat_summary(o, ws, _p, row_pos, xlwt, _xs) + +account_journal_xls('report.nov.account.journal.xls', 'account.journal.period', + parser=account_journal_xls_parser) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/account_journal_report_xls/static/src/img/icon.png b/account_journal_report_xls/static/src/img/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..272d0294347c7c2fda3bc37cf726a9079c3f6313 GIT binary patch literal 15230 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 F{udP(AcX(` literal 0 HcmV?d00001 diff --git a/account_journal_report_xls/wizard/__init__.py b/account_journal_report_xls/wizard/__init__.py new file mode 100644 index 00000000..154d6a6e --- /dev/null +++ b/account_journal_report_xls/wizard/__init__.py @@ -0,0 +1,25 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# +# Copyright (c) 2013 Noviat nv/sa (www.noviat.com). All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from . import print_journal_wizard + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/account_journal_report_xls/wizard/print_journal_wizard.py b/account_journal_report_xls/wizard/print_journal_wizard.py new file mode 100644 index 00000000..fa507ad0 --- /dev/null +++ b/account_journal_report_xls/wizard/print_journal_wizard.py @@ -0,0 +1,171 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# +# Copyright (c) 2013 Noviat nv/sa (www.noviat.com). All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from openerp.tools.translate import _ +from openerp.osv import orm, fields +from openerp.addons.account.wizard.account_report_common_journal import account_common_journal_report +import time +import logging +_logger = logging.getLogger(__name__) + +class account_print_journal_xls(orm.TransientModel): + _inherit = 'account.print.journal' + _name = 'account.print.journal.xls' + _description = 'Print/Export Journal' + _columns = { + 'journal_ids': fields.many2many('account.journal', string='Journals', required=True), + 'group_entries': fields.boolean('Group Entries', help="Group entries with same General Account & Tax Code."), + } + _defaults={ + 'group_entries': True, + } + + def fields_get(self, cr, uid, fields=None, context=None): + res = super(account_print_journal_xls, self).fields_get(cr, uid, fields, context) + if context.get('print_by') == 'fiscalyear': + if 'fiscalyear_id' in res: + res['fiscalyear_id']['required'] = True + if 'period_from' in res: + res['period_from']['readonly'] = True + if 'period_to' in res: + res['period_to']['readonly'] = True + else: + if 'period_from' in res: + res['period_from']['required'] = True + if 'period_to' in res: + res['period_to']['required'] = True + return res + + def fy_period_ids(self, cr, uid, fiscalyear_id): + """ returns all periods from a fiscalyear sorted by date """ + fy_period_ids = [] + cr.execute('SELECT id, coalesce(special, False) AS special FROM account_period ' \ + 'WHERE fiscalyear_id=%s ORDER BY date_start, special DESC', + (fiscalyear_id,)) + res = cr.fetchall() + if res: + fy_period_ids = map(lambda x: x[0], res) + return fy_period_ids + + def onchange_fiscalyear_id(self, cr, uid, ids, fiscalyear_id=False, context=None): + res = {'value': {}} + if context.get('print_by') == 'fiscalyear': + # get period_from/to with opening/close periods + fy_period_ids = self.fy_period_ids(cr, uid, fiscalyear_id) + if fy_period_ids: + res['value']['period_from'] = fy_period_ids[0] + res['value']['period_to'] = fy_period_ids[-1] + return res + + def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): + """ skip account.common.journal.report,fields_view_get (adds domain filter on journal type) """ + return super(account_common_journal_report, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu) + + def xls_export(self, cr, uid, ids, context=None): + return self.print_report(cr, uid, ids, context=context) + + def print_report(self, cr, uid, ids, context=None): + if context is None: + context = {} + move_obj = self.pool.get('account.move') + print_by = context.get('print_by') + wiz_form = self.browse(cr, uid, ids)[0] + fiscalyear_id = wiz_form.fiscalyear_id.id + company_id = wiz_form.company_id.id + + if print_by == 'fiscalyear': + wiz_period_ids = self.fy_period_ids(cr, uid, fiscalyear_id) + else: + period_from = wiz_form.period_from + period_to = wiz_form.period_to + cr.execute("SELECT id, coalesce(special, False) AS special FROM account_period ap " \ + "WHERE ap.date_start>=%s AND ap.date_stop<=%s AND company_id=%s " \ + "ORDER BY date_start, special DESC", + (period_from.date_start, period_to.date_stop, company_id)) + wiz_period_ids = map(lambda x: x[0], cr.fetchall()) + wiz_journal_ids = [j.id for j in wiz_form.journal_ids] + + # sort journals + cr.execute('SELECT id FROM account_journal ' \ + 'WHERE id IN %s ORDER BY type DESC', + (tuple(wiz_journal_ids),)) + wiz_journal_ids = map(lambda x: x[0], cr.fetchall()) + + datas = { + 'model': 'account.journal', + 'print_by': print_by, + 'sort_selection': wiz_form.sort_selection, + 'target_move': wiz_form.target_move, + 'display_currency': wiz_form.amount_currency, + 'group_entries': wiz_form.group_entries, + } + + if wiz_form.target_move == 'posted': + move_states = ['posted'] + else: + move_states = ['draft','posted'] + + if print_by == 'fiscalyear': + journal_fy_ids = [] + for journal_id in wiz_journal_ids: + aml_ids = move_obj.search(cr, uid, + [('journal_id', '=', journal_id), ('period_id', 'in', wiz_period_ids), ('state', 'in', move_states)], + limit=1) + if aml_ids: + journal_fy_ids.append((journal_id, fiscalyear_id)) + if not journal_fy_ids: + raise orm.except_orm(_('No Data Available'), _('No records found for your selection!')) + datas.update({ + 'ids': [x[0] for x in journal_fy_ids], + 'journal_fy_ids': journal_fy_ids, + }) + else: + # perform account.move.line query in stead of 'account.journal.period' since this table is not always reliable + journal_period_ids = [] + for journal_id in wiz_journal_ids: + period_ids = [] + for period_id in wiz_period_ids: + aml_ids = move_obj.search(cr, uid, + [('journal_id', '=', journal_id), ('period_id', '=', period_id), ('state', 'in', move_states)], + limit=1) + if aml_ids: + period_ids.append(period_id) + if period_ids: + journal_period_ids.append((journal_id, period_ids)) + if not journal_period_ids: + raise orm.except_orm(_('No Data Available'), _('No records found for your selection!')) + datas.update({ + 'ids': [x[0] for x in journal_period_ids], + 'journal_period_ids': journal_period_ids, + }) + + if context.get('xls_export'): + return {'type': 'ir.actions.report.xml', + 'report_name': 'nov.account.journal.xls', + 'datas': datas} + else: + return { + 'type': 'ir.actions.report.xml', + 'report_name': 'nov.account.journal.print', + 'datas': datas} + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/account_journal_report_xls/wizard/print_journal_wizard.xml b/account_journal_report_xls/wizard/print_journal_wizard.xml new file mode 100644 index 00000000..6c3496e0 --- /dev/null +++ b/account_journal_report_xls/wizard/print_journal_wizard.xml @@ -0,0 +1,80 @@ + + + + + + Print/Export Journals + account.print.journal.xls + + + + + onchange_fiscalyear_id(fiscalyear_id, context) + + + + + + + + + + + + + + + + + + + + + + + + Journal by Period + ir.actions.act_window + account.print.journal.xls + form + form + {'print_by':'period'} + + new + + + + + Journal by Fiscal Year + ir.actions.act_window + account.print.journal.xls + form + form + {'print_by':'fiscalyear'} + + new + + + + + 3 + + + + \ No newline at end of file From 0064b81dce1907380afd18d234d90134a2dcd8a0 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Thu, 19 Dec 2013 18:08:40 +0100 Subject: [PATCH 2/4] coding guidelines improvement --- account_journal_report_xls/__openerp__.py | 14 +- account_journal_report_xls/account_journal.py | 29 ++-- account_journal_report_xls/report/__init__.py | 1 - .../report/nov_account_journal.py | 161 +++++++++--------- .../report/nov_account_journal_xls.py | 138 +++++++-------- .../wizard/print_journal_wizard.py | 39 ++--- 6 files changed, 192 insertions(+), 190 deletions(-) diff --git a/account_journal_report_xls/__openerp__.py b/account_journal_report_xls/__openerp__.py index 8cbcb1f7..6cd9f593 100644 --- a/account_journal_report_xls/__openerp__.py +++ b/account_journal_report_xls/__openerp__.py @@ -25,9 +25,9 @@ 'version': '0.1', 'license': 'AGPL-3', 'author': 'Noviat', - 'category' : 'Accounting & Finance', + 'category': 'Accounting & Finance', 'description': """ - + Journal Reports =============== @@ -36,20 +36,20 @@ This module adds journal reports by period and by fiscal year with - option to group entries with same general account & VAT case - vat info per entry - vat summary - + These reports are available in PDF and XLS format. -If you are installing this module manually, you need also the module 'report_xls', that is located in: -https://launchpad.net/openerp-reporting-engines" +This module depends upon the 'report_xls' module, +cf. https://launchpad.net/openerp-reporting-engines """, 'depends': [ 'account_voucher', - 'report_xls' + 'report_xls', ], 'demo_xml': [], 'init_xml': [], - 'update_xml' : [ + 'update_xml': [ 'wizard/print_journal_wizard.xml', ], } diff --git a/account_journal_report_xls/account_journal.py b/account_journal_report_xls/account_journal.py index 649e4360..c1e3dbcf 100644 --- a/account_journal_report_xls/account_journal.py +++ b/account_journal_report_xls/account_journal.py @@ -24,20 +24,21 @@ from openerp.osv import orm from openerp.addons.report_xls.utils import rowcol_to_cell, _render from openerp.tools.translate import _ + class account_journal(orm.Model): _inherit = 'account.journal' - + # allow inherited modules to extend the query def _report_xls_query_extra(self, cr, uid, context=None): select_extra = "" join_extra = "" where_extra = "" - return [select_extra, join_extra, where_extra] + return (select_extra, join_extra, where_extra) # allow inherited modules to add document references def _report_xls_document_extra(self, cr, uid, context): return "''" - + # override list in inherited module to add/drop columns or change order def _report_xls_fields(self, cr, uid, context=None): res = [ @@ -47,37 +48,37 @@ class account_journal(orm.Model): ] if context.get('print_by') == 'fiscalyear': res += [ - 'period', # account.period,code or name + 'period', # account.period,code or name ] res += [ 'partner_name', # res.partner,name - 'aml_name', # account.move.line,name - 'tax_code', # account.tax.code,code + 'aml_name', # account.move.line,name + 'tax_code', # account.tax.code,code 'tax_amount', # account.move.line,tax_amount 'debit', # account.move.line,debit 'credit', # account.move.line,credit 'balance', # debit-credit - 'docname', # origin document if any - #'date_maturity', # account.move.line,date_maturity + 'docname', # origin document if any + #'date_maturity', # account.move.line,date_maturity #'reconcile', # account.move.line,reconcile_id.name #'reconcile_partial', # account.move.line,reconcile_partial_id.name #'partner_ref', # res.partner,ref - #'move_ref', # account.move,ref + #'move_ref', # account.move,ref #'move_id', # account.move,id ] return res # Change/Add Template entries - def _report_xls_template(self, cr, uid, context=None): - """ - Template updates, e.g. + def _report_xls_template(self, cr, uid, context=None): + """ + Template updates, e.g. my_change = { 'move_name':{ - 'header': [1, 20, 'text', _('My Move Title')], + 'header': [1, 20, 'text', _render("_('My Move Title')")], 'lines': [1, 0, 'text', _render("l['move_name'] != '/' and l['move_name'] or ('*'+str(l['move_id']))")], 'totals': [1, 0, 'text', None]}, } return my_change - """ + """ return {} diff --git a/account_journal_report_xls/report/__init__.py b/account_journal_report_xls/report/__init__.py index c08b6513..100df303 100644 --- a/account_journal_report_xls/report/__init__.py +++ b/account_journal_report_xls/report/__init__.py @@ -24,4 +24,3 @@ import nov_account_journal import nov_account_journal_xls # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/account_journal_report_xls/report/nov_account_journal.py b/account_journal_report_xls/report/nov_account_journal.py index 5de8c6a4..54c28334 100644 --- a/account_journal_report_xls/report/nov_account_journal.py +++ b/account_journal_report_xls/report/nov_account_journal.py @@ -28,10 +28,11 @@ _logger = logging.getLogger(__name__) _ir_translation_name = 'nov.account.journal.print' + class nov_journal_print(report_sxw.rml_parse): - + def set_context(self, objects, data, ids, report_type=None): - #_logger.warn('set_context, objects = %s, data = %s, ids = %s', objects, data, ids) + #_logger.warn('set_context, objects = %s, data = %s, ids = %s', objects, data, ids) super(nov_journal_print, self).set_context(objects, data, ids) j_obj = self.pool.get('account.journal') p_obj = self.pool.get('account.period') @@ -40,7 +41,7 @@ class nov_journal_print(report_sxw.rml_parse): if data['target_move'] == 'posted': self.move_states = ['posted'] else: - self.move_states = ['draft','posted'] + self.move_states = ['draft', 'posted'] self.display_currency = self.localcontext['display_currency'] = data['display_currency'] self.group_entries = data['group_entries'] self.print_by = data['print_by'] @@ -51,7 +52,7 @@ class nov_journal_print(report_sxw.rml_parse): for jp in journal_period_ids: journal = j_obj.browse(self.cr, self.uid, jp[0], self.context) periods = p_obj.browse(self.cr, self.uid, jp[1], self.context) - objects.extend([(journal, period) for period in periods]) + objects.extend([(journal, period) for period in periods]) self.localcontext['objects'] = self.objects = objects else: journal_fy_ids = data['journal_fy_ids'] @@ -59,9 +60,9 @@ class nov_journal_print(report_sxw.rml_parse): for jf in journal_fy_ids: journal = j_obj.browse(self.cr, self.uid, jf[0], self.context) fiscalyear = fy_obj.browse(self.cr, self.uid, jf[1], self.context) - objects.append((journal, fiscalyear)) + objects.append((journal, fiscalyear)) self.localcontext['objects'] = self.objects = objects - + def __init__(self, cr, uid, name, context): if context is None: context = {} @@ -74,7 +75,7 @@ class nov_journal_print(report_sxw.rml_parse): 'sum1': self._sum1, 'sum2': self._sum2, 'tax_codes': self._tax_codes, - 'sum_vat': self._sum_vat, + 'sum_vat': self._sum_vat, '_': self._, }) self.context = context @@ -82,13 +83,13 @@ class nov_journal_print(report_sxw.rml_parse): def _(self, src): lang = self.context.get('lang', 'en_US') return translate(self.cr, _ir_translation_name, 'report', lang, src) or src - + def _title(self, object): return ((self.print_by == 'period' and self._('Period') or self._('Fiscal Year')) + ' ' + object[1].name, object[0].name) def _amount_title(self): return self.display_currency and (self._('Amount'), self._('Currency')) or (self._('Debit'), self._('Credit')) - + def _lines(self, object): j_obj = self.pool.get('account.journal') _ = self._ @@ -99,91 +100,89 @@ class nov_journal_print(report_sxw.rml_parse): period_id = period.id period_ids = [period_id] # update status period - ids_journal_period = self.pool.get('account.journal.period').search(self.cr, self.uid, - [('journal_id', '=', journal_id), ('period_id', '=', period_id)]) + ids_journal_period = self.pool.get('account.journal.period').search(self.cr, self.uid, + [('journal_id', '=', journal_id), ('period_id', '=', period_id)]) if ids_journal_period: self.cr.execute( - 'update account_journal_period set state=%s where journal_id=%s and period_id=%s and state=%s', - ('printed', journal_id, period_id, 'draft') - ) + 'update account_journal_period set state=%s where journal_id=%s and period_id=%s and state=%s', + ('printed', journal_id, period_id, 'draft')) else: self.pool.get('account.journal.period').create(self.cr, self.uid, { - 'name': (journal.code or journal.name)+':'+(period.name or ''), + 'name': (journal.code or journal.name) + ':' + (period.name or ''), 'journal_id': journal.id, 'period_id': period.id, 'state': 'printed', }) _logger.error("The Entry for Period '%s', Journal '%s' was missing in 'account.journal.period' and has been fixed now !", period.name, journal.name) - else: + else: fiscalyear = object[1] period_ids = [x.id for x in fiscalyear.period_ids] - + select_extra, join_extra, where_extra = j_obj._report_xls_query_extra(self.cr, self.uid, self.context) - - self.cr.execute("SELECT l.move_id AS move_id, l.id AS aml_id, " \ - "am.name AS move_name, coalesce(am.ref,'') AS move_ref, am.date AS move_date, " \ - "aa.id AS account_id, aa.code AS acc_code, " \ - "coalesce(rp.name,'') AS partner_name, coalesce(rp.ref,'') AS partner_ref, rp.id AS partner_id, " \ - "coalesce(l.name,'') AS aml_name, " \ - "l.date_maturity AS date_maturity, " \ - "coalesce(ap.code, ap.name) AS period, " \ - "coalesce(atc.code,'') AS tax_code, atc.id AS tax_code_id, coalesce(l.tax_amount,0.0) AS tax_amount, " \ - "coalesce(l.debit,0.0) AS debit, coalesce(l.credit,0.0) AS credit, " \ - "coalesce(amr.name,'') AS reconcile, coalesce(amrp.name,'') AS reconcile_partial, " \ - "coalesce(l.amount_currency,0.0) AS amount_currency, " \ - "rc.id AS currency_id, rc.name AS currency_name, rc.symbol AS currency_symbol, " \ - "coalesce(ai.internal_number,'-') AS inv_number, coalesce(abs.name,'-') AS st_number, coalesce(av.number,'-') AS voucher_number " \ - + select_extra + \ - "FROM account_move_line l " \ - "INNER JOIN account_move am ON l.move_id = am.id " \ - "INNER JOIN account_account aa ON l.account_id = aa.id " \ - "INNER JOIN account_period ap ON l.period_id = ap.id " \ - "LEFT OUTER JOIN account_invoice ai ON ai.move_id = am.id " \ - "LEFT OUTER JOIN account_voucher av ON av.move_id = am.id " \ - "LEFT OUTER JOIN account_bank_statement abs ON l.statement_id = abs.id " \ - "LEFT OUTER JOIN res_partner rp ON l.partner_id = rp.id " \ - "LEFT OUTER JOIN account_tax_code atc ON l.tax_code_id = atc.id " \ - "LEFT OUTER JOIN account_move_reconcile amr ON l.reconcile_id = amr.id " \ - "LEFT OUTER JOIN account_move_reconcile amrp ON l.reconcile_partial_id = amrp.id " \ - "LEFT OUTER JOIN res_currency rc ON l.currency_id = rc.id " \ - + join_extra + \ - "WHERE l.period_id IN %s AND l.journal_id = %s " \ - "AND am.state IN %s " \ - + where_extra + \ + + self.cr.execute("SELECT l.move_id AS move_id, l.id AS aml_id, " + "am.name AS move_name, coalesce(am.ref,'') AS move_ref, am.date AS move_date, " + "aa.id AS account_id, aa.code AS acc_code, " + "coalesce(rp.name,'') AS partner_name, coalesce(rp.ref,'') AS partner_ref, rp.id AS partner_id, " + "coalesce(l.name,'') AS aml_name, " + "l.date_maturity AS date_maturity, " + "coalesce(ap.code, ap.name) AS period, " + "coalesce(atc.code,'') AS tax_code, atc.id AS tax_code_id, coalesce(l.tax_amount,0.0) AS tax_amount, " + "coalesce(l.debit,0.0) AS debit, coalesce(l.credit,0.0) AS credit, " + "coalesce(amr.name,'') AS reconcile, coalesce(amrp.name,'') AS reconcile_partial, " + "coalesce(l.amount_currency,0.0) AS amount_currency, " + "rc.id AS currency_id, rc.name AS currency_name, rc.symbol AS currency_symbol, " + "coalesce(ai.internal_number,'-') AS inv_number, coalesce(abs.name,'-') AS st_number, coalesce(av.number,'-') AS voucher_number " + + select_extra + + "FROM account_move_line l " + "INNER JOIN account_move am ON l.move_id = am.id " + "INNER JOIN account_account aa ON l.account_id = aa.id " + "INNER JOIN account_period ap ON l.period_id = ap.id " + "LEFT OUTER JOIN account_invoice ai ON ai.move_id = am.id " + "LEFT OUTER JOIN account_voucher av ON av.move_id = am.id " + "LEFT OUTER JOIN account_bank_statement abs ON l.statement_id = abs.id " + "LEFT OUTER JOIN res_partner rp ON l.partner_id = rp.id " + "LEFT OUTER JOIN account_tax_code atc ON l.tax_code_id = atc.id " + "LEFT OUTER JOIN account_move_reconcile amr ON l.reconcile_id = amr.id " + "LEFT OUTER JOIN account_move_reconcile amrp ON l.reconcile_partial_id = amrp.id " + "LEFT OUTER JOIN res_currency rc ON l.currency_id = rc.id " + + join_extra + + "WHERE l.period_id IN %s AND l.journal_id = %s " + "AND am.state IN %s " + + where_extra + "ORDER BY " + self.sort_selection + ", move_date, move_id, acc_code", - (tuple(period_ids), journal_id, tuple(self.move_states)) - ) + (tuple(period_ids), journal_id, tuple(self.move_states))) lines = self.cr.dictfetchall() - + # add reference of corresponding origin document - if journal.type in ['sale', 'sale_refund', 'purchase', 'purchase_refund']: - map(lambda x: x.update({'docname' : (_('Invoice') + ': ' + x['inv_number']) or (_('Voucher') + ': ' + x['voucher_number']) or '-'}), lines) - elif journal.type in ['bank', 'cash']: - map(lambda x: x.update({'docname' : (_('Statement') + ': ' + x['st_number']) or (_('Voucher') + ': ' + x['voucher_number']) or '-'}), lines) - else: + if journal.type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'): + [x.update({'docname': (_('Invoice') + ': ' + x['inv_number']) or (_('Voucher') + ': ' + x['voucher_number']) or '-'}) for x in lines] + elif journal.type in ('bank', 'cash'): + [x.update({'docname': (_('Statement') + ': ' + x['st_number']) or (_('Voucher') + ': ' + x['voucher_number']) or '-'}) for x in lines] + else: code_string = j_obj._report_xls_document_extra(self.cr, self.uid, self.context) #_logger.warn('code_string= %s', code_string) - map(lambda x: x.update({'docname' : eval(code_string) or '-'}), lines) + [x.update({'docname': eval(code_string) or '-'}) for x in lines] # format debit, credit, amount_currency for pdf report if self.display_currency and self.report_type == 'pdf': curr_obj = self.pool.get('res.currency') - map(lambda x: x.update({ - 'amount1': self.formatLang(x['debit']-x['credit']), - 'amount2': self.formatLang(x['amount_currency'], monetary=True, currency_obj=curr_obj.browse(self.cr, self.uid, x['currency_id'])) - }), lines) + [x.update({ + 'amount1': self.formatLang(x['debit'] - x['credit']), + 'amount2': self.formatLang(x['amount_currency'], monetary=True, currency_obj=curr_obj.browse(self.cr, self.uid, x['currency_id'])), + }) for x in lines] else: - map(lambda x: x.update({'amount1': self.formatLang(x['debit']), 'amount2': self.formatLang(x['credit'])}), lines) + [x.update({'amount1': self.formatLang(x['debit']), 'amount2': self.formatLang(x['credit'])}) for x in lines] # group lines if self.group_entries: lines = self._group_lines(lines) # insert a flag in every move_line to indicate the end of a move - # this flag will be used to draw a full line between moves - for cnt in range(len(lines)-1): - if lines[cnt]['move_id'] <> lines[cnt+1]['move_id']: + # this flag will be used to draw a full line between moves + for cnt in range(len(lines) - 1): + if lines[cnt]['move_id'] != lines[cnt + 1]['move_id']: lines[cnt]['draw_line'] = 1 else: lines[cnt]['draw_line'] = 0 @@ -192,7 +191,7 @@ class nov_journal_print(report_sxw.rml_parse): return lines def _group_lines(self, lines_in): - + _ = self._ def group_move(lines_in): @@ -209,24 +208,24 @@ class nov_journal_print(report_sxw.rml_parse): lines_grouped[key]['tax_amount'] += line['tax_amount'] lines_grouped[key]['aml_name'] = _('Grouped Entries') lines_out = lines_grouped.values() - lines_out.sort(key=lambda x:x['acc_code']) + lines_out.sort(key=lambda x: x['acc_code']) return lines_out - + lines_out = [] grouped_lines = [lines_in[0]] move_id = lines_in[0]['move_id'] line_cnt = len(lines_in) - for i in range(1,line_cnt): + for i, line in enumerate(lines_in): line = lines_in[i] - if line['move_id'] == move_id: + if line['move_id'] == move_id: grouped_lines.append(line) - if i == line_cnt-1: + if i == line_cnt - 1: lines_out += group_move(grouped_lines) else: lines_out += group_move(grouped_lines) grouped_lines = [line] move_id = line['move_id'] - + return lines_out def _tax_codes(self, object): @@ -234,17 +233,17 @@ class nov_journal_print(report_sxw.rml_parse): if self.print_by == 'period': period_id = object[1].id period_ids = [period_id] - else: + else: fiscalyear = object[1] period_ids = [x.id for x in fiscalyear.period_ids] self.cr.execute( - "SELECT distinct tax_code_id FROM account_move_line l " \ - "INNER JOIN account_move am ON l.move_id = am.id " \ + "SELECT distinct tax_code_id FROM account_move_line l " + "INNER JOIN account_move am ON l.move_id = am.id " "WHERE l.period_id in %s AND l.journal_id=%s AND l.tax_code_id IS NOT NULL AND am.state IN %s", (tuple(period_ids), journal_id, tuple(self.move_states))) ids = map(lambda x: x[0], self.cr.fetchall()) if ids: - self.cr.execute('SELECT id FROM account_tax_code WHERE id IN %s ORDER BY code', (tuple(ids),)) + self.cr.execute('SELECT id FROM account_tax_code WHERE id IN %s ORDER BY code', (tuple(ids),)) tax_code_ids = map(lambda x: x[0], self.cr.fetchall()) else: tax_code_ids = [] @@ -263,7 +262,7 @@ class nov_journal_print(report_sxw.rml_parse): "INNER JOIN account_move am ON l.move_id = am.id " \ "WHERE l.period_id IN %s AND l.journal_id=%s AND am.state IN %s" if field == 'tax_amount': - select += " AND tax_code_id=%s" %tax_code_id + select += " AND tax_code_id=%s" % tax_code_id self.cr.execute(select, (tuple(period_ids), journal_id, tuple(self.move_states))) return self.cr.fetchone()[0] or 0.0 @@ -272,21 +271,21 @@ class nov_journal_print(report_sxw.rml_parse): def _sum2(self, object): if self.display_currency: - return '' + return '' else: return self._totals('credit', object) def _sum_vat(self, object, tax_code): return self._totals('tax_amount', object, tax_code.id) - + def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False, dp=False, currency_obj=False): if isinstance(value, (float, int)) and not value: return '' else: return super(nov_journal_print, self).formatLang(value, digits, date, date_time, grouping, monetary, dp, currency_obj) -report_sxw.report_sxw('report.nov.account.journal.print', 'account.journal', - 'addons/account_journal_report_xls/report/nov_account_journal.rml', +report_sxw.report_sxw('report.nov.account.journal.print', 'account.journal', + 'addons/account_journal_report_xls/report/nov_account_journal.rml', parser=nov_journal_print, header=False) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/account_journal_report_xls/report/nov_account_journal_xls.py b/account_journal_report_xls/report/nov_account_journal_xls.py index f03d0727..34229a43 100644 --- a/account_journal_report_xls/report/nov_account_journal_xls.py +++ b/account_journal_report_xls/report/nov_account_journal_xls.py @@ -32,8 +32,9 @@ from openerp.tools.translate import _ import logging _logger = logging.getLogger(__name__) + class account_journal_xls_parser(nov_journal_print): - + def __init__(self, cr, uid, name, context): super(account_journal_xls_parser, self).__init__(cr, uid, name, context=context) journal_obj = self.pool.get('account.journal') @@ -46,113 +47,114 @@ class account_journal_xls_parser(nov_journal_print): 'template_changes': template_changes, }) + class account_journal_xls(report_xls): def __init__(self, name, table, rml=False, parser=False, header=True, store=False): super(account_journal_xls, self).__init__(name, table, rml, parser, header, store) - + # Cell Styles - _xs = self.xls_styles + _xs = self.xls_styles # header rh_cell_format = _xs['bold'] + _xs['fill'] + _xs['borders_all'] self.rh_cell_style = xlwt.easyxf(rh_cell_format) self.rh_cell_style_center = xlwt.easyxf(rh_cell_format + _xs['center']) self.rh_cell_style_right = xlwt.easyxf(rh_cell_format + _xs['right']) - # lines + # lines aml_cell_format = _xs['borders_all'] self.aml_cell_style = xlwt.easyxf(aml_cell_format) self.aml_cell_style_center = xlwt.easyxf(aml_cell_format + _xs['center']) - self.aml_cell_style_date = xlwt.easyxf(aml_cell_format + _xs['left'], num_format_str = report_xls.date_format) - self.aml_cell_style_decimal = xlwt.easyxf(aml_cell_format + _xs['right'], num_format_str = report_xls.decimal_format) + self.aml_cell_style_date = xlwt.easyxf(aml_cell_format + _xs['left'], num_format_str=report_xls.date_format) + self.aml_cell_style_decimal = xlwt.easyxf(aml_cell_format + _xs['right'], num_format_str=report_xls.decimal_format) # totals rt_cell_format = _xs['bold'] + _xs['fill'] + _xs['borders_all'] self.rt_cell_style = xlwt.easyxf(rt_cell_format) - self.rt_cell_style_right = xlwt.easyxf(rt_cell_format + _xs['right']) - self.rt_cell_style_decimal = xlwt.easyxf(rt_cell_format + _xs['right'], num_format_str = report_xls.decimal_format) - + self.rt_cell_style_right = xlwt.easyxf(rt_cell_format + _xs['right']) + self.rt_cell_style_decimal = xlwt.easyxf(rt_cell_format + _xs['right'], num_format_str=report_xls.decimal_format) + # XLS Template Journal Items self.col_specs_lines_template = { - 'move_name':{ + 'move_name': { 'header': [1, 20, 'text', _render("_('Entry')")], 'lines': [1, 0, 'text', _render("l['move_name'] != '/' and l['move_name'] or ('*'+str(l['move_id']))")], 'totals': [1, 0, 'text', None]}, - 'move_date':{ + 'move_date': { 'header': [1, 13, 'text', _render("_('Date')")], 'lines': [1, 0, 'date', _render("datetime.strptime(l['move_date'],'%Y-%m-%d')"), None, self.aml_cell_style_date], 'totals': [1, 0, 'text', None]}, - 'acc_code':{ + 'acc_code': { 'header': [1, 12, 'text', _render("_('Account')")], 'lines': [1, 0, 'text', _render("l['acc_code']")], 'totals': [1, 0, 'text', None]}, - 'aml_name':{ + 'aml_name': { 'header': [1, 42, 'text', _render("_('Description')")], - 'lines': [1, 0, 'text', _render("l['aml_name']")], + 'lines': [1, 0, 'text', _render("l['aml_name']")], 'totals': [1, 0, 'text', None]}, - 'period':{ + 'period': { 'header': [1, 12, 'text', _render("_('Period')")], 'lines': [1, 0, 'text', _render("l['period']")], 'totals': [1, 0, 'text', None]}, - 'partner_name':{ + 'partner_name': { 'header': [1, 36, 'text', _render("_('Partner')")], 'lines': [1, 0, 'text', _render("l['partner_name']")], 'totals': [1, 0, 'text', None]}, - 'partner_ref':{ + 'partner_ref': { 'header': [1, 36, 'text', _render("_('Partner Reference')")], 'lines': [1, 0, 'text', _render("l['partner_ref']")], 'totals': [1, 0, 'text', None]}, - 'date_maturity':{ + 'date_maturity': { 'header': [1, 13, 'text', _render("_('Maturity Date')")], 'lines': [1, 0, _render("l['date_maturity'] and 'date' or 'text'"), _render("l['date_maturity'] and datetime.strptime(l['date_maturity'],'%Y-%m-%d') or None"), None, self.aml_cell_style_date], 'totals': [1, 0, 'text', None]}, - 'debit':{ + 'debit': { 'header': [1, 18, 'text', _render("_('Debit')"), None, self.rh_cell_style_right], 'lines': [1, 0, 'number', _render("l['debit']"), None, self.aml_cell_style_decimal], 'totals': [1, 0, 'number', None, _render("debit_formula"), self.rt_cell_style_decimal]}, - 'credit':{ + 'credit': { 'header': [1, 18, 'text', _render("_('Credit')"), None, self.rh_cell_style_right], 'lines': [1, 0, 'number', _render("l['credit']"), None, self.aml_cell_style_decimal], 'totals': [1, 0, 'number', None, _render("credit_formula"), self.rt_cell_style_decimal]}, - 'balance':{ + 'balance': { 'header': [1, 18, 'text', _render("_('Balance')"), None, self.rh_cell_style_right], 'lines': [1, 0, 'number', None, _render("bal_formula"), self.aml_cell_style_decimal], 'totals': [1, 0, 'number', None, _render("bal_formula"), self.rt_cell_style_decimal]}, - 'reconcile':{ + 'reconcile': { 'header': [1, 12, 'text', _render("_('Rec.')"), None, self.rh_cell_style_center], 'lines': [1, 0, 'text', _render("l['reconcile']"), None, self.aml_cell_style_center], 'totals': [1, 0, 'text', None]}, - 'reconcile_partial':{ + 'reconcile_partial': { 'header': [1, 12, 'text', _render("_('Part. Rec.')"), None, self.rh_cell_style_center], 'lines': [1, 0, 'text', _render("l['reconcile_partial']"), None, self.aml_cell_style_center], 'totals': [1, 0, 'text', None]}, - 'tax_code':{ + 'tax_code': { 'header': [1, 6, 'text', _render("_('VAT')"), None, self.rh_cell_style_center], 'lines': [1, 0, 'text', _render("l['tax_code']"), None, self.aml_cell_style_center], 'totals': [1, 0, 'text', None]}, - 'tax_amount':{ + 'tax_amount': { 'header': [1, 18, 'text', _render("_('VAT Amount')"), None, self.rh_cell_style_right], 'lines': [1, 0, 'number', _render("l['tax_amount']"), None, self.aml_cell_style_decimal], 'totals': [1, 0, 'text', None]}, - 'amount_currency':{ + 'amount_currency': { 'header': [1, 18, 'text', _render("_('Am. Currency')"), None, self.rh_cell_style_right], 'lines': [1, 0, _render("l['amount_currency'] and 'number' or 'text'"), _render("l['amount_currency'] or None"), None, self.aml_cell_style_decimal], 'totals': [1, 0, 'text', None]}, - 'currency_name':{ + 'currency_name': { 'header': [1, 6, 'text', _render("_('Curr.')"), None, self.rh_cell_style_center], 'lines': [1, 0, 'text', _render("l['currency_name']"), None, self.aml_cell_style_center], 'totals': [1, 0, 'text', None]}, - 'docname':{ + 'docname': { 'header': [1, 35, 'text', _render("_('Document')")], 'lines': [1, 0, 'text', _render("l['docname']")], 'totals': [1, 0, 'text', None]}, - 'move_ref':{ + 'move_ref': { 'header': [1, 25, 'text', _render("_('Entry Reference')")], 'lines': [1, 0, 'text', _render("l['move_ref']")], 'totals': [1, 0, 'text', None]}, - 'move_id':{ + 'move_id': { 'header': [1, 10, 'text', _render("_('Entry Id')")], 'lines': [1, 0, 'text', _render("str(l['move_id'])")], 'totals': [1, 0, 'text', None]}, @@ -160,20 +162,20 @@ class account_journal_xls(report_xls): # XLS Template VAT Summary self.col_specs_vat_summary_template = { - 'tax_case_name':{ + 'tax_case_name': { 'header': [1, 45, 'text', _render("_('Description')")], 'tax_totals': [1, 0, 'text', _render("t.name")]}, - 'tax_code':{ + 'tax_code': { 'header': [1, 6, 'text', _render("_('Case')")], 'tax_totals': [1, 0, 'text', _render("t.code")]}, - 'tax_amount':{ + 'tax_amount': { 'header': [1, 18, 'text', _render("_('Amount')"), None, self.rh_cell_style_right], 'tax_totals': [1, 0, 'number', _render("sum_vat(o,t)"), None, self.aml_cell_style_decimal]}, } - def _journal_title(self, o, ws, _p, row_pos, xlwt, _xs): - cell_style = xlwt.easyxf(_xs['xls_title']) - report_name = (10*' ').join([ + def _journal_title(self, o, ws, _p, row_pos, xlwt, _xs): + cell_style = xlwt.easyxf(_xs['xls_title']) + report_name = (10 * ' ').join([ _p.company.name, _p.title(o)[0], _p.title(o)[1], @@ -181,23 +183,23 @@ class account_journal_xls(report_xls): ]) c_specs = [ ('report_name', 1, 0, 'text', report_name), - ] + ] row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs]) row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=cell_style) return row_pos + 1 - def _journal_lines(self, o, ws, _p, row_pos, xlwt, _xs): - + def _journal_lines(self, o, ws, _p, row_pos, xlwt, _xs): + wanted_list = self.wanted_list debit_pos = self.debit_pos - credit_pos = self.credit_pos - + credit_pos = self.credit_pos + # Column headers c_specs = map(lambda x: self.render(x, self.col_specs_lines_template, 'header', render_space={'_': _p._}), wanted_list) row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs]) - row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=self.rh_cell_style, set_column_size=True) - ws.set_horz_split_pos(row_pos) - + row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=self.rh_cell_style, set_column_size=True) + ws.set_horz_split_pos(row_pos) + # account move lines aml_start_pos = row_pos aml_cnt = len(_p.lines(o)) @@ -213,13 +215,13 @@ class account_journal_xls(report_xls): if l['draw_line'] and cnt != aml_cnt: row_pos += 1 - # Totals + # Totals debit_start = rowcol_to_cell(aml_start_pos, debit_pos) debit_stop = rowcol_to_cell(row_pos - 1, debit_pos) - debit_formula = 'SUM(%s:%s)' %(debit_start, debit_stop) + debit_formula = 'SUM(%s:%s)' % (debit_start, debit_stop) credit_start = rowcol_to_cell(aml_start_pos, credit_pos) credit_stop = rowcol_to_cell(row_pos - 1, credit_pos) - credit_formula = 'SUM(%s:%s)' %(credit_start, credit_stop) + credit_formula = 'SUM(%s:%s)' % (credit_start, credit_stop) debit_cell = rowcol_to_cell(row_pos, debit_pos) credit_cell = rowcol_to_cell(row_pos, credit_pos) bal_formula = debit_cell + '-' + credit_cell @@ -228,25 +230,25 @@ class account_journal_xls(report_xls): row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=self.rt_cell_style_right) return row_pos + 1 - def _journal_vat_summary(self, o, ws, _p, row_pos, xlwt, _xs): - + def _journal_vat_summary(self, o, ws, _p, row_pos, xlwt, _xs): + if not _p.tax_codes(o): return row_pos - + title_cell_style = xlwt.easyxf(_xs['bold']) - c_specs = [('summary_title', 1, 0, 'text', _p._("VAT Declaration"))] + c_specs = [('summary_title', 1, 0, 'text', _p._("VAT Declaration"))] row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs]) - row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=title_cell_style) + 1 - + row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=title_cell_style) + 1 + wanted_list = self.wanted_list vat_summary_wanted_list = ['tax_case_name', 'tax_code', 'tax_amount'] - + # calculate col_span cols_number = len(wanted_list) vat_summary_cols_number = len(vat_summary_wanted_list) if vat_summary_cols_number > cols_number: - raise orm.except_orm(_('Programming Error!'), - _("vat_summary_cols_number should be < cols_number !")) + raise orm.except_orm(_('Programming Error!'), + _("vat_summary_cols_number should be < cols_number !")) index = 0 for i in range(vat_summary_cols_number): col = vat_summary_wanted_list[i] @@ -263,20 +265,20 @@ class account_journal_xls(report_xls): self.col_specs_vat_summary_template[col]['header'][0] = col_span self.col_specs_vat_summary_template[col]['tax_totals'][0] = col_span index += 1 - + c_specs = map(lambda x: self.render(x, self.col_specs_vat_summary_template, 'header'), vat_summary_wanted_list) row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs]) row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=self.rh_cell_style) - + for t in _p.tax_codes(o): c_specs = map(lambda x: self.render(x, self.col_specs_vat_summary_template, 'tax_totals'), vat_summary_wanted_list) row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs]) row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=self.aml_cell_style) - + return row_pos def generate_xls_report(self, _p, _xs, data, objects, wb): - + wanted_list = _p.wanted_list if _p.display_currency: wanted_list += ['amount_currency', 'currency_name'] @@ -286,29 +288,29 @@ class account_journal_xls(report_xls): self.debit_pos = 'debit' in wanted_list and wanted_list.index('debit') self.credit_pos = 'credit' in wanted_list and wanted_list.index('credit') if not (self.credit_pos and self.debit_pos) and 'balance' in wanted_list: - raise orm.except_orm(_('Customisation Error!'), + raise orm.except_orm(_('Customisation Error!'), _("The 'Balance' field is a calculated XLS field requiring the presence of the 'Debit' and 'Credit' fields !")) for o in objects: - + sheet_name = ' - '.join([o[1].code, o[0].code])[:31].replace('/', '-') sheet_name = sheet_name[:31].replace('/', '-') ws = wb.add_sheet(sheet_name) ws.panes_frozen = True ws.remove_splits = True - ws.portrait = 0 # Landscape + ws.portrait = 0 # Landscape ws.fit_width_to_pages = 1 row_pos = 0 - + # set print header/footer ws.header_str = self.xls_headers['standard'] ws.footer_str = self.xls_footers['standard'] # Data - row_pos = self._journal_title(o, ws, _p, row_pos, xlwt, _xs) - row_pos = self._journal_lines(o, ws, _p, row_pos, xlwt, _xs) - row_pos = self._journal_vat_summary(o, ws, _p, row_pos, xlwt, _xs) - + row_pos = self._journal_title(o, ws, _p, row_pos, xlwt, _xs) + row_pos = self._journal_lines(o, ws, _p, row_pos, xlwt, _xs) + row_pos = self._journal_vat_summary(o, ws, _p, row_pos, xlwt, _xs) + account_journal_xls('report.nov.account.journal.xls', 'account.journal.period', parser=account_journal_xls_parser) diff --git a/account_journal_report_xls/wizard/print_journal_wizard.py b/account_journal_report_xls/wizard/print_journal_wizard.py index fa507ad0..45fadc43 100644 --- a/account_journal_report_xls/wizard/print_journal_wizard.py +++ b/account_journal_report_xls/wizard/print_journal_wizard.py @@ -27,18 +27,19 @@ import time import logging _logger = logging.getLogger(__name__) + class account_print_journal_xls(orm.TransientModel): - _inherit = 'account.print.journal' + _inherit = 'account.print.journal' _name = 'account.print.journal.xls' _description = 'Print/Export Journal' _columns = { 'journal_ids': fields.many2many('account.journal', string='Journals', required=True), 'group_entries': fields.boolean('Group Entries', help="Group entries with same General Account & Tax Code."), } - _defaults={ + _defaults = { 'group_entries': True, } - + def fields_get(self, cr, uid, fields=None, context=None): res = super(account_print_journal_xls, self).fields_get(cr, uid, fields, context) if context.get('print_by') == 'fiscalyear': @@ -53,19 +54,19 @@ class account_print_journal_xls(orm.TransientModel): res['period_from']['required'] = True if 'period_to' in res: res['period_to']['required'] = True - return res + return res def fy_period_ids(self, cr, uid, fiscalyear_id): """ returns all periods from a fiscalyear sorted by date """ fy_period_ids = [] - cr.execute('SELECT id, coalesce(special, False) AS special FROM account_period ' \ + cr.execute('SELECT id, coalesce(special, False) AS special FROM account_period ' 'WHERE fiscalyear_id=%s ORDER BY date_start, special DESC', (fiscalyear_id,)) res = cr.fetchall() if res: - fy_period_ids = map(lambda x: x[0], res) + fy_period_ids = [x[0] for x in res] return fy_period_ids - + def onchange_fiscalyear_id(self, cr, uid, ids, fiscalyear_id=False, context=None): res = {'value': {}} if context.get('print_by') == 'fiscalyear': @@ -79,7 +80,7 @@ class account_print_journal_xls(orm.TransientModel): def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): """ skip account.common.journal.report,fields_view_get (adds domain filter on journal type) """ return super(account_common_journal_report, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu) - + def xls_export(self, cr, uid, ids, context=None): return self.print_report(cr, uid, ids, context=context) @@ -88,7 +89,7 @@ class account_print_journal_xls(orm.TransientModel): context = {} move_obj = self.pool.get('account.move') print_by = context.get('print_by') - wiz_form = self.browse(cr, uid, ids)[0] + wiz_form = self.browse(cr, uid, ids)[0] fiscalyear_id = wiz_form.fiscalyear_id.id company_id = wiz_form.company_id.id @@ -97,18 +98,18 @@ class account_print_journal_xls(orm.TransientModel): else: period_from = wiz_form.period_from period_to = wiz_form.period_to - cr.execute("SELECT id, coalesce(special, False) AS special FROM account_period ap " \ - "WHERE ap.date_start>=%s AND ap.date_stop<=%s AND company_id=%s " \ + cr.execute("SELECT id, coalesce(special, False) AS special FROM account_period ap " + "WHERE ap.date_start>=%s AND ap.date_stop<=%s AND company_id=%s " "ORDER BY date_start, special DESC", (period_from.date_start, period_to.date_stop, company_id)) - wiz_period_ids = map(lambda x: x[0], cr.fetchall()) + wiz_period_ids = [x[0] for x in cr.fetchall()] wiz_journal_ids = [j.id for j in wiz_form.journal_ids] # sort journals - cr.execute('SELECT id FROM account_journal ' \ + cr.execute('SELECT id FROM account_journal ' 'WHERE id IN %s ORDER BY type DESC', (tuple(wiz_journal_ids),)) - wiz_journal_ids = map(lambda x: x[0], cr.fetchall()) + wiz_journal_ids = [x[0] for x in cr.fetchall()] datas = { 'model': 'account.journal', @@ -122,13 +123,13 @@ class account_print_journal_xls(orm.TransientModel): if wiz_form.target_move == 'posted': move_states = ['posted'] else: - move_states = ['draft','posted'] + move_states = ['draft', 'posted'] if print_by == 'fiscalyear': journal_fy_ids = [] for journal_id in wiz_journal_ids: - aml_ids = move_obj.search(cr, uid, - [('journal_id', '=', journal_id), ('period_id', 'in', wiz_period_ids), ('state', 'in', move_states)], + aml_ids = move_obj.search(cr, uid, + [('journal_id', '=', journal_id), ('period_id', 'in', wiz_period_ids), ('state', 'in', move_states)], limit=1) if aml_ids: journal_fy_ids.append((journal_id, fiscalyear_id)) @@ -144,8 +145,8 @@ class account_print_journal_xls(orm.TransientModel): for journal_id in wiz_journal_ids: period_ids = [] for period_id in wiz_period_ids: - aml_ids = move_obj.search(cr, uid, - [('journal_id', '=', journal_id), ('period_id', '=', period_id), ('state', 'in', move_states)], + aml_ids = move_obj.search(cr, uid, + [('journal_id', '=', journal_id), ('period_id', '=', period_id), ('state', 'in', move_states)], limit=1) if aml_ids: period_ids.append(period_id) From e89a8db8de13663185a88a09b013734f05571bcb Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Fri, 20 Dec 2013 02:18:22 +0100 Subject: [PATCH 3/4] map --- account_journal_report_xls/wizard/print_journal_wizard.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/account_journal_report_xls/wizard/print_journal_wizard.py b/account_journal_report_xls/wizard/print_journal_wizard.py index 45fadc43..75216164 100644 --- a/account_journal_report_xls/wizard/print_journal_wizard.py +++ b/account_journal_report_xls/wizard/print_journal_wizard.py @@ -102,14 +102,14 @@ class account_print_journal_xls(orm.TransientModel): "WHERE ap.date_start>=%s AND ap.date_stop<=%s AND company_id=%s " "ORDER BY date_start, special DESC", (period_from.date_start, period_to.date_stop, company_id)) - wiz_period_ids = [x[0] for x in cr.fetchall()] + wiz_period_ids = map(lambda x: x[0], cr.fetchall()) wiz_journal_ids = [j.id for j in wiz_form.journal_ids] # sort journals cr.execute('SELECT id FROM account_journal ' 'WHERE id IN %s ORDER BY type DESC', (tuple(wiz_journal_ids),)) - wiz_journal_ids = [x[0] for x in cr.fetchall()] + wiz_journal_ids = map(lambda x: x[0], cr.fetchall()) datas = { 'model': 'account.journal', From 2117be85679f8239aecdcdf20ca3d4b3316c0432 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Mon, 23 Dec 2013 22:36:43 +0100 Subject: [PATCH 4/4] bugfix --- account_journal_report_xls/report/nov_account_journal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_journal_report_xls/report/nov_account_journal.py b/account_journal_report_xls/report/nov_account_journal.py index 54c28334..d46fb5d4 100644 --- a/account_journal_report_xls/report/nov_account_journal.py +++ b/account_journal_report_xls/report/nov_account_journal.py @@ -215,7 +215,7 @@ class nov_journal_print(report_sxw.rml_parse): grouped_lines = [lines_in[0]] move_id = lines_in[0]['move_id'] line_cnt = len(lines_in) - for i, line in enumerate(lines_in): + for i in range(1,line_cnt): line = lines_in[i] if line['move_id'] == move_id: grouped_lines.append(line)