[MRG] from head

account_financial_report_horizontal/i18n/es.po

@@ -7,26 +7,25 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-11 21:59+0000\n"
-"PO-Revision-Date: 2014-01-31 17:10+0000\n"
-"Last-Translator: Joël Grand-Guillaume @ camptocamp "
-"<joel.grandguillaume@camptocamp.com>\n"
+"PO-Revision-Date: 2014-02-21 01:10+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-01 06:52+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 07:31+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 "Language: \n"
 
 #. module: account_financial_report_horizontal
 #: model:ir.actions.report.xml,name:account_financial_report_horizontal.account_balance_sheet_horizontal
 msgid "Balance Sheet Horizontal"
-msgstr ""
+msgstr "Balance de situación horizontal"
 
 #. module: account_financial_report_horizontal
 #: report:account.profit_loss:0
 msgid "Incomes"
-msgstr ""
+msgstr "Ingresos"
 
 #. module: account_financial_report_horizontal
 #: code:addons/account_financial_report_horizontal/report/common_report_header.py:92
@@ -39,7 +38,7 @@ msgstr "Error"
 #. module: account_financial_report_horizontal
 #: model:ir.actions.report.xml,name:account_financial_report_horizontal.account_profit_loss_horizontal
 msgid "Profit and Loss Horizontal"
-msgstr ""
+msgstr "Pérdidas y ganancias horizontal"
 
 #. module: account_financial_report_horizontal
 #: field:account.bs.report,reserve_account_id:0
@@ -76,9 +75,9 @@ msgid ""
 "allowing you to quickly check the balance of each of your accounts in a "
 "single report"
 msgstr ""
-"Este informe le permite imprimir o generar un pdf de su balance de sumas y "
-"saldos permitiendo comprobar con rapidez el saldo de cada una de sus cuentas "
-"en un único informe."
+"Este informe le permite imprimir o generar un PDF de su balance de sumas y "
+"saldos para comprobar con rapidez el saldo de cada una de sus cuentas en un "
+"único informe."
 
 #. module: account_financial_report_horizontal
 #: report:account.balancesheet:0
@@ -118,7 +117,7 @@ msgstr "Sin filtro"
 #: selection:account.pl.report,display_account:0
 #: selection:account_financial_report_horizontal.common.account.report,display_account:0
 msgid "With balance is not equal to 0"
-msgstr "Con balance si no es igual a 0"
+msgstr "Con saldo distinto a 0"
 
 #. module: account_financial_report_horizontal
 #: report:account.profit_horizontal:0
@@ -317,7 +316,7 @@ msgstr "Beneficio neto"
 #: selection:account_financial_report_horizontal.common.account.report,filter:0
 #: selection:account_financial_report_horizontal.common.report,filter:0
 msgid "No Filters"
-msgstr "No filtros"
+msgstr "Sin filtros"
 
 #. module: account_financial_report_horizontal
 #: model:ir.model,name:account_financial_report_horizontal.model_account_financial_report_horizontal_common_report
@@ -390,7 +389,7 @@ msgstr "Código"
 #. module: account_financial_report_horizontal
 #: model:ir.actions.report.xml,name:account_financial_report_horizontal.account_profit_loss
 msgid "Profit and Loss"
-msgstr ""
+msgstr "Pérdidas y ganancias"
 
 #. module: account_financial_report_horizontal
 #: model:ir.model,name:account_financial_report_horizontal.model_account_financial_report_horizontal_common_account_report
@@ -410,7 +409,7 @@ msgstr "Contabilidad. Informe balance de situación"
 #. module: account_financial_report_horizontal
 #: report:account.profit_loss:0
 msgid "Expenses"
-msgstr ""
+msgstr "Gastos"
 
 #. module: account_financial_report_horizontal
 #: field:account.bs.report,period_to:0
@@ -465,7 +464,7 @@ msgstr "Cancelar"
 #. module: account_financial_report_horizontal
 #: model:ir.ui.menu,name:account_financial_report_horizontal.final_accounting_reports
 msgid "Alt. Accounting Reports"
-msgstr ""
+msgstr "Informes de contabilidad alternativos"
 
 #. module: account_financial_report_horizontal
 #: help:account.bs.report,chart_account_id:0
@@ -473,7 +472,7 @@ msgstr ""
 #: help:account_financial_report_horizontal.common.account.report,chart_account_id:0
 #: help:account_financial_report_horizontal.common.report,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr "Seleccionar plan contable."
+msgstr "Seleccionar plan contable"
 
 #. module: account_financial_report_horizontal
 #: field:account.bs.report,filter:0

account_financial_report_webkit/__openerp__.py

@@ -167,7 +167,7 @@ an issue in wkhtmltopdf
 the header and footer are created as text with arguments passed to
 wkhtmltopdf. The texts are defined inside the report classes.
 """,
-    'version': '1.1',
+    'version': '1.1.0',
     'author': 'Camptocamp',
     'license': 'AGPL-3',
     'category': 'Finance',

account_financial_report_webkit/i18n/it.po

@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: account-financial-report\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-05-07 07:02+0000\n"
-"PO-Revision-Date: 2014-02-08 17:19+0000\n"
+"PO-Revision-Date: 2014-02-12 15:52+0000\n"
 "Last-Translator: Andrea Cometa <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-09 06:49+0000\n"
+"X-Launchpad-Export-Date: 2014-02-13 06:46+0000\n"
 "X-Generator: Launchpad (build 16916)\n"
 
 #. module: account_financial_report_webkit
@@ -177,7 +177,7 @@ msgstr "Stampa bilancio partner"
 #: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:220
 #, python-format
 msgid "Webkit render"
-msgstr ""
+msgstr "Render webkit"
 
 #. module: account_financial_report_webkit
 #: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:165
@@ -304,7 +304,7 @@ msgstr "Conti visualizzati"
 #: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:112
 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:108
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: account_financial_report_webkit
 #: help:account.common.balance.report,chart_account_id:0
@@ -578,7 +578,7 @@ msgstr ""
 #: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:124
 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:118
 msgid "Cumul. Bal."
-msgstr ""
+msgstr "Bil. Cumul."
 
 #. module: account_financial_report_webkit
 #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:22

account_financial_report_webkit/report/webkit_parser_header_fix.py

@@ -41,7 +41,6 @@ from openerp import addons
 from openerp import pooler
 from openerp import tools
 from openerp.addons.report_webkit import webkit_report
-from openerp.addons.report_webkit.webkit_report import mako_template
 from openerp.addons.report_webkit.report_helper import WebKitHelper
 
 _logger = logging.getLogger('financial.reports.webkit')
@@ -71,6 +70,20 @@ _logger = logging.getLogger('financial.reports.webkit')
 #        })
 
 
+# redefine mako_template as this is overriden by jinja since saas-1
+# from openerp.addons.report_webkit.webkit_report import mako_template
+from mako.template import Template
+from mako.lookup import TemplateLookup
+
+def mako_template(text):
+    """Build a Mako template.
+
+    This template uses UTF-8 encoding
+    """
+    tmp_lookup  = TemplateLookup() #we need it in order to allow inclusion and inheritance
+    return Template(text, input_encoding='utf-8', output_encoding='utf-8', lookup=tmp_lookup)
+
+
 class HeaderFooterTextWebKitParser(webkit_report.WebKitParser):
 
     def generate_pdf(self, comm_path, report_xml, header, footer, html_list, webkit_header=False):

account_financial_report_webkit/tests/open_invoices.yml

@@ -29,7 +29,7 @@
         data_dict = {'chart_account_id':ref('account.chart0'), 'fiscalyear_id': ref('account.data_fiscalyear'),
                      'until_date': '%s-12-31' %(datetime.now().year), 'target_move': 'posted',
                      'amount_currency': True, 'result_selection': 'customer_supplier',
-                     'partner_ids': [ref('base.res_partner_agrolait'), ref('base.res_partner_asus')]}
+                     'partner_ids': [ref('base.res_partner_2'), ref('base.res_partner_1')]}
         from tools import test_reports
         test_reports.try_report_action(cr, uid, 'action_account_open_invoices_menu_webkit',wiz_data=data_dict, context=ctx, our_module='account_financial_report_webkit')
 

account_financial_report_webkit/tests/partner_ledger.yml

@@ -29,7 +29,7 @@
         data_dict = {'chart_account_id':ref('account.chart0'), 'fiscalyear_id': ref('account.data_fiscalyear'),
                      'until_date': '%s-12-31' %(datetime.now().year), 'target_move': 'posted',
                      'amount_currency': True, 'result_selection': 'customer_supplier',
-                     'partner_ids': [ref('base.res_partner_agrolait'), ref('base.res_partner_asus')]}
+                     'partner_ids': [ref('base.res_partner_2'), ref('base.res_partner_1')]}
         from tools import test_reports
         test_reports.try_report_action(cr, uid, 'action_account_partners_ledger_menu_webkit',wiz_data=data_dict, context=ctx, our_module='account_financial_report_webkit')
 

account_journal_report_xls/__init__.py

@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #
-#    Copyright (c) 2013 Noviat nv/sa (www.noviat.com). All rights reserved.
+#    Copyright (c) 2014 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

account_journal_report_xls/__openerp__.py

@@ -22,7 +22,7 @@
 
 {
     'name': 'Financial Journal reports',
-    'version': '0.1',
+    'version': '0.2',
     'license': 'AGPL-3',
     'author': 'Noviat',
     'category': 'Accounting & Finance',

account_journal_report_xls/account_journal.py

@@ -65,6 +65,11 @@ class account_journal(orm.Model):
             #'partner_ref',       # res.partner,ref
             #'move_ref',          # account.move,ref
             #'move_id',           # account.move,id
+            #'acc_name',          # account.account,name
+            #'journal',           # account.journal,name
+            #'journal_code',      # account.journal,code
+            #'analytic_account',       # account.analytic.account,name
+            #'analytic_account_code',  # account.analytic.account,code
         ]
         return res
 

account_journal_report_xls/i18n/fr.po

@@ -6,8 +6,8 @@ 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"
+"POT-Creation-Date: 2014-01-19 17:16:37.990000\n"
+"PO-Revision-Date: 2014-01-19 17:16:37.990000\n"
 "Last-Translator: Luc De Meyer (Noviat nv/sa)\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -119,11 +119,36 @@ msgstr "Exercice fiscal"
 msgid "Journal Overview"
 msgstr "Journal détaillé"
 
+#. module: account_journal_report_xls
+#: report:nov.account.journal.print:0
+msgid "Journal Items"
+msgstr "Écritures comptables"
+
 #. 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 "Name"
+msgstr "Nom"
+
+#. module: account_journal_report_xls
+#: report:nov.account.journal.print:0
+msgid "Reference"
+msgstr "Référence"
+
+#. module: account_journal_report_xls
+#: report:nov.account.journal.print:0
+msgid "Effective Date"
+msgstr "Date"
+
+#. 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 "Date"
@@ -134,6 +159,16 @@ msgstr "Date"
 msgid "Account"
 msgstr "Compte"
 
+#. module: account_journal_report_xls
+#: report:nov.account.journal.print:0
+msgid "Account Name"
+msgstr "Description compte "
+
+#. module: account_journal_report_xls
+#: report:nov.account.journal.print:0
+msgid "Journal"
+msgstr "Journal"
+
 #. module: account_journal_report_xls
 #: report:nov.account.journal.print:0
 msgid "Description"
@@ -179,6 +214,16 @@ msgstr "Let."
 msgid "Part. Rec."
 msgstr "Let. Part."
 
+#. module: account_journal_report_xls
+#: report:nov.account.journal.print:0
+msgid "Tax Code"
+msgstr "Case TVA"
+
+#. module: account_journal_report_xls
+#: report:nov.account.journal.print:0
+msgid "Tax/Base Amount"
+msgstr "Montant TVA/Base"
+
 #. module: account_journal_report_xls
 #: report:nov.account.journal.print:0
 msgid "VAT"
@@ -209,6 +254,16 @@ msgstr "Montant devise"
 msgid "Curr."
 msgstr "Dev."
 
+#. module: account_journal_report_xls
+#: report:nov.account.journal.print:0
+msgid "Comp. Curr."
+msgstr "Dev. Soc."
+
+#. module: account_journal_report_xls
+#: report:nov.account.journal.print:0
+msgid "Analytic Account"
+msgstr "Compte analytique"
+
 #. module: account_journal_report_xls
 #: report:nov.account.journal.print:0
 msgid "Document"

account_journal_report_xls/i18n/nl.po

@@ -6,8 +6,8 @@ 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"
+"POT-Creation-Date: 2014-01-19 17:16:37.980000\n"
+"PO-Revision-Date: 2014-01-19 17:16:37.980000\n"
 "Last-Translator: Luc De Meyer (Noviat nv/sa)\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -119,11 +119,36 @@ msgstr "Boekjaar"
 msgid "Journal Overview"
 msgstr "Dagboekoverzicht"
 
+#. module: account_journal_report_xls
+#: report:nov.account.journal.print:0
+msgid "Journal Items"
+msgstr "Boekingsregels"
+
 #. 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 "Name"
+msgstr "Naam"
+
+#. module: account_journal_report_xls
+#: report:nov.account.journal.print:0
+msgid "Reference"
+msgstr "Referentie"
+
+#. module: account_journal_report_xls
+#: report:nov.account.journal.print:0
+msgid "Effective Date"
+msgstr "Datum"
+
+#. 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 "Date"
@@ -134,6 +159,16 @@ msgstr "Datum"
 msgid "Account"
 msgstr "Rekening"
 
+#. module: account_journal_report_xls
+#: report:nov.account.journal.print:0
+msgid "Account Name"
+msgstr "Omschrijving rekening"
+
+#. module: account_journal_report_xls
+#: report:nov.account.journal.print:0
+msgid "Journal"
+msgstr "Dagboek"
+
 #. module: account_journal_report_xls
 #: report:nov.account.journal.print:0
 msgid "Description"
@@ -179,6 +214,16 @@ msgstr "Rec."
 msgid "Part. Rec."
 msgstr "Rec. Part."
 
+#. module: account_journal_report_xls
+#: report:nov.account.journal.print:0
+msgid "Tax Code"
+msgstr "BTW vak"
+
+#. module: account_journal_report_xls
+#: report:nov.account.journal.print:0
+msgid "Tax/Base Amount"
+msgstr "Bedrag BTW/Mvh"
+
 #. module: account_journal_report_xls
 #: report:nov.account.journal.print:0
 msgid "VAT"
@@ -209,6 +254,16 @@ msgstr "Bedrag valuta"
 msgid "Curr."
 msgstr "Val."
 
+#. module: account_journal_report_xls
+#: report:nov.account.journal.print:0
+msgid "Comp. Curr."
+msgstr "Bedr. Val."
+
+#. module: account_journal_report_xls
+#: report:nov.account.journal.print:0
+msgid "Analytic Account"
+msgstr "Kostenplaats"
+
 #. module: account_journal_report_xls
 #: report:nov.account.journal.print:0
 msgid "Document"

account_journal_report_xls/report/nov_account_journal.py

@@ -121,9 +121,12 @@ class nov_journal_print(report_sxw.rml_parse):
 
         select_extra, join_extra, where_extra = j_obj._report_xls_query_extra(self.cr, self.uid, self.context)
 
+        # SQL select for performance reasons, as a consequence, there are no field value translations.
+        # If performance is no issue, you can adapt the _report_xls_template in an inherited module to add field value translations.
         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, "
+            "aa.id AS account_id, aa.code AS acc_code, aa.name AS acc_name, "
+            "aj.name AS journal, aj.code AS journal_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, "
@@ -131,6 +134,7 @@ class nov_journal_print(report_sxw.rml_parse):
             "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, "
+            "ana.name AS an_acc_name, coalesce(ana.code,'') AS an_acc_code, "
             "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 "
@@ -138,6 +142,7 @@ class nov_journal_print(report_sxw.rml_parse):
             "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_journal aj ON l.journal_id = aj.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 "
@@ -146,6 +151,7 @@ class nov_journal_print(report_sxw.rml_parse):
             "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 account_analytic_account ana ON l.analytic_account_id = ana.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 "

account_journal_report_xls/report/nov_account_journal_xls.py

@@ -86,6 +86,10 @@ class account_journal_xls(report_xls):
                 'header': [1, 12, 'text',  _render("_('Account')")],
                 'lines': [1, 0, 'text', _render("l['acc_code']")],
                 'totals': [1, 0, 'text', None]},
+            'acc_name': {
+                'header': [1, 36, 'text', _render("_('Account Name')")],
+                'lines': [1, 0, 'text', _render("l['acc_name']")],
+                'totals': [1, 0, 'text', None]},
             'aml_name': {
                 'header': [1, 42, 'text', _render("_('Description')")],
                 'lines': [1, 0, 'text', _render("l['aml_name']")],
@@ -94,6 +98,22 @@ class account_journal_xls(report_xls):
                 'header': [1, 12, 'text', _render("_('Period')")],
                 'lines': [1, 0, 'text', _render("l['period']")],
                 'totals': [1, 0, 'text', None]},
+            'journal': {
+                'header': [1, 20, 'text', _render("_('Journal')")],
+                'lines': [1, 0, 'text', _render("l['journal']")],
+                'totals': [1, 0, 'text', None]},
+            'journal_code': {
+                'header': [1, 10, 'text', _render("_('Journal')")],
+                'lines': [1, 0, 'text', _render("l['journal_code']")],
+                'totals': [1, 0, 'text', None]},
+            'analytic_account': {
+                'header': [1, 20, 'text', _render("_('Analytic Account')")],
+                'lines': [1, 0, 'text', _render("l['an_acc_name']")],
+                'totals': [1, 0, 'text', None]},
+            'analytic_account_code': {
+                'header': [1, 20, 'text', _render("_('Analytic Account')")],
+                'lines': [1, 0, 'text', _render("l['an_acc_code']")],
+                'totals': [1, 0, 'text', None]},
             'partner_name': {
                 'header': [1, 36, 'text', _render("_('Partner')")],
                 'lines': [1, 0, 'text', _render("l['partner_name']")],

account_journal_report_xls/wizard/__init__.py

@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #
-#    Copyright (c) 2013 Noviat nv/sa (www.noviat.com). All rights reserved.
+#    Copyright (c) 2014 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

account_journal_report_xls/wizard/print_journal_wizard.py

@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #
-#    Copyright (c) 2013 Noviat nv/sa (www.noviat.com). All rights reserved.
+#    Copyright (c) 2014 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