From db43f2cb020273abcbef12d29c97ae6454b42555 Mon Sep 17 00:00:00 2001 From: Sebastien LANGE Date: Thu, 12 Sep 2013 10:53:27 -1000 Subject: [PATCH 1/2] [IMP] Add print journal --- .../__openerp__.py | 3 +- account_financial_report_webkit/i18n/fr.po | 781 +++++++++++------- .../report/__init__.py | 1 + .../report/common_reports.py | 3 + .../report/print_journal.py | 145 ++++ .../report/report.xml | 20 + .../account_report_print_journal.mako | 169 ++++ .../report_menus.xml | 9 + .../wizard/__init__.py | 3 + .../wizard/print_journal.py | 140 ++++ .../wizard/print_journal_view.xml | 101 +++ 11 files changed, 1065 insertions(+), 310 deletions(-) create mode 100644 account_financial_report_webkit/report/print_journal.py create mode 100644 account_financial_report_webkit/report/templates/account_report_print_journal.mako create mode 100644 account_financial_report_webkit/wizard/print_journal.py create mode 100644 account_financial_report_webkit/wizard/print_journal_view.xml diff --git a/account_financial_report_webkit/__openerp__.py b/account_financial_report_webkit/__openerp__.py index b15ad080..605798a6 100644 --- a/account_financial_report_webkit/__openerp__.py +++ b/account_financial_report_webkit/__openerp__.py @@ -115,7 +115,7 @@ date can be outside its logical period and the initial balance could be different when computed by data or by initial balance for the period). The opening period is assumed to be the Jan. 1st of the year with an opening flag and the first period of the year must start also -on Jan 1st. +on Jan 1st. Totals for amounts in currencies are effective if the partner belongs to an account with a secondary currency. @@ -147,6 +147,7 @@ wkhtmltopdf. The texts are defined inside the report classes. 'wizard/trial_balance_wizard_view.xml', 'wizard/partner_balance_wizard_view.xml', 'wizard/open_invoices_wizard_view.xml', + 'wizard/print_journal_view.xml', 'report_menus.xml', ], # tests order matter diff --git a/account_financial_report_webkit/i18n/fr.po b/account_financial_report_webkit/i18n/fr.po index 39a8388a..812d4d2d 100644 --- a/account_financial_report_webkit/i18n/fr.po +++ b/account_financial_report_webkit/i18n/fr.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.3\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2012-01-20 10:47+0000\n" -"PO-Revision-Date: 2012-01-20 10:47+0000\n" +"Project-Id-Version: OpenERP Server 7.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-09-06 12:56+0000\n" +"PO-Revision-Date: 2013-09-06 12:56+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,6 +15,11 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: account_financial_report_webkit +#: view:open.invoices.webkit:0 +msgid "onchange_date_to(fiscalyear_id, period_to, date_to, until_date)" +msgstr "onchange_date_to(fiscalyear_id, period_to, date_to, until_date)" + #. module: account_financial_report_webkit #: field:account.common.balance.report,account_ids:0 #: field:general.ledger.webkit,account_ids:0 @@ -24,7 +29,7 @@ msgid "Filter on accounts" msgstr "Filtre par compte" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/common_reports.py:424 +#: code:addons/account_financial_report_webkit/report/common_reports.py:432 #, python-format msgid "Please set a valid time filter" msgstr "Veuillez selectionner un filtre de temps valide" @@ -37,9 +42,8 @@ msgid "Layout Options" msgstr "Options de format" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:203 -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:223 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:253 +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:209 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:258 msgid "Cumulated Balance on Account" msgstr "Solde cumulé" @@ -49,8 +53,8 @@ msgid "Activate Centralization" msgstr "Centralisation activée" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:154 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:161 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:160 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:167 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:120 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:127 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:135 @@ -59,40 +63,43 @@ msgid "Balance %s" msgstr "Solde %s" #. module: account_financial_report_webkit -#: view:account.move.line:0 -msgid "Misc." -msgstr "Divers" +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:32 +msgid "Journal Filter" +msgstr "Journal Filter" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:92 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:95 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:102 msgid "Periods Filter:" msgstr "Filtre par période:" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:172 +#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:180 #, python-format msgid "No header defined for this Webkit report!" msgstr "Pas d'en-tête défini pour ce rapport Webkit!" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/open_invoices.py:162 +#: code:addons/account_financial_report_webkit/report/open_invoices.py:189 #, python-format msgid "Filter has to be in filter date, period, or none" msgstr "Filtre par date, periode au aucun uniquement" #. module: account_financial_report_webkit -#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_trial_balance_menu_webkit #: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_trial_balance_webkit msgid "Trial Balance Webkit" msgstr "Balance des comptes" #. module: account_financial_report_webkit -#: constraint:account.account:0 -msgid "Configuration Error! \n" -"You cannot define children to an account with internal type different of \"View\"! " -msgstr "Erreur de paramétrage! \n" -"Vous ne pouvez pas définir de sous-compte sur un compte non \"Vue\"! " +#: field:account.common.balance.report,company_id:0 +#: field:general.ledger.webkit,company_id:0 +#: field:open.invoices.webkit,company_id:0 +#: field:partner.balance.webkit,company_id:0 +#: field:partners.ledger.webkit,company_id:0 +#: field:print.journal.webkit,company_id:0 +#: field:trial.balance.webkit,company_id:0 +msgid "Company" +msgstr "Company" #. module: account_financial_report_webkit #: view:partner.balance.webkit:0 @@ -100,17 +107,23 @@ msgid "This report is an analysis done by a partner, It is a PDF report containi msgstr "Ce rapport montre les soldes ouverts par client ou fourniseurs." #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:138 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:142 msgid "Account / Partner Name" msgstr "Compte / Partenaire" #. module: account_financial_report_webkit #: field:account.common.balance.report,journal_ids:0 +#: code:addons/account_financial_report_webkit/report/print_journal.py:48 #: field:general.ledger.webkit,journal_ids:0 +#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_print_journal_menu_webkit +#: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_print_journal_webkit #: field:open.invoices.webkit,journal_ids:0 #: field:partner.balance.webkit,journal_ids:0 #: field:partners.ledger.webkit,journal_ids:0 +#: view:print.journal.webkit:0 +#: field:print.journal.webkit,journal_ids:0 #: field:trial.balance.webkit,journal_ids:0 +#, python-format msgid "Journals" msgstr "Journaux" @@ -118,19 +131,22 @@ msgstr "Journaux" #: help:general.ledger.webkit,amount_currency:0 #: help:open.invoices.webkit,amount_currency:0 #: help:partners.ledger.webkit,amount_currency:0 +#: help:print.journal.webkit,amount_currency:0 msgid "It adds the currency column" msgstr "Ajoute la colonne devise" #. module: account_financial_report_webkit +#: code:addons/account_financial_report_webkit/report/common_reports.py:78 #: selection:open.invoices.webkit,result_selection:0 #: selection:partner.balance.webkit,result_selection:0 #: selection:partners.ledger.webkit,result_selection:0 -#: code:addons/account_financial_report_webkit/report/common_reports.py:73 #, python-format msgid "Receivable and Payable Accounts" msgstr "Comptes clients et fournisseurs" #. module: account_financial_report_webkit +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:99 +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:82 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:104 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:119 #: model:ir.model,name:account_financial_report_webkit.model_account_account @@ -138,15 +154,15 @@ msgid "Account" msgstr "Comptes" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/trial_balance.py:42 +#: code:addons/account_financial_report_webkit/report/trial_balance.py:44 #, python-format msgid "TRIAL BALANCE" msgstr "BALANCE DES COMPTES" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:118 +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:84 msgid "Due Date" -msgstr "Echéance" +msgstr "Due Date" #. module: account_financial_report_webkit #: view:general.ledger.webkit:0 @@ -158,112 +174,89 @@ msgid "Print only" msgstr "Filter sur:" #. module: account_financial_report_webkit -#: constraint:account.move.line:0 -msgid "You can not create move line on closed account." -msgstr "Impossible de créer une ligne d'écriture sur un compte clôturé." - -#. module: account_financial_report_webkit -#: model:ir.model,name:account_financial_report_webkit.model_account_report_partner_balance_webkit +#: model:ir.model,name:account_financial_report_webkit.model_partner_balance_webkit msgid "Partner Balance Report" -msgstr "Balance des tiers" +msgstr "Partner Balance Report" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:221 +#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:204 +#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:215 #: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:230 -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:247 -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:258 #, python-format msgid "Webkit render" msgstr "Rendu Webkit" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:167 +#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:175 #, python-format msgid "Error!" msgstr "Erreur!" #. module: account_financial_report_webkit -#: model:ir.model,name:account_financial_report_webkit.model_account_report_trial_balance_webkit +#: model:ir.model,name:account_financial_report_webkit.model_trial_balance_webkit msgid "Trial Balance Report" -msgstr "Balance des comptes" +msgstr "Balance générale" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:117 -msgid "Code" -msgstr "Code" +#: code:addons/account_financial_report_webkit/report/partners_ledger.py:48 +#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_partners_ledger_menu_webkit +#: view:partners.ledger.webkit:0 +#, python-format +msgid "Partner Ledger" +msgstr "Livre des tiers" #. module: account_financial_report_webkit -#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_partners_ledger_menu_webkit #: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_partners_ledger_webkit msgid "Partner Ledger Webkit" msgstr "Livre des tiers" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:192 +#: field:account.common.balance.report,display_account:0 +#: field:partner.balance.webkit,display_account:0 +#: field:print.journal.webkit,display_account:0 +#: field:trial.balance.webkit,display_account:0 +msgid "Display Accounts" +msgstr "Display Accounts" + +#. module: account_financial_report_webkit +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:206 msgid "Unallocated" msgstr "Non-alloué" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:116 +#: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_general_ledger_webkit +msgid "General Ledger Webkit" +msgstr "Grand Livre des comptes" + +#. module: account_financial_report_webkit #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:112 msgid "Rec." msgstr "Let." #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:123 -#, python-format -msgid "Webkit raise an error" -msgstr "Erreur Webkit" - -#. module: account_financial_report_webkit +#: code:addons/account_financial_report_webkit/report/common_reports.py:74 #: selection:open.invoices.webkit,result_selection:0 #: selection:partner.balance.webkit,result_selection:0 #: selection:partners.ledger.webkit,result_selection:0 -#: code:addons/account_financial_report_webkit/report/common_reports.py:69 #, python-format msgid "Receivable Accounts" msgstr "Comptes clients" -#. module: account_financial_report_webkit -#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_general_ledger_menu_webkit -#: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_general_ledger_webkit -msgid "General Ledger Webkit" -msgstr "Grand Livre des comptes" - -#. module: account_financial_report_webkit -#: field:account.common.balance.report,period_from:0 -#: field:general.ledger.webkit,period_from:0 -#: field:open.invoices.webkit,period_from:0 -#: field:partner.balance.webkit,period_from:0 -#: field:partners.ledger.webkit,period_from:0 -#: field:trial.balance.webkit,period_from:0 -msgid "Start period" -msgstr "Période Début" - -#. module: account_financial_report_webkit -#: model:ir.model,name:account_financial_report_webkit.model_account_report_open_transactions_webkit -msgid "Open Transactions Report" -msgstr "Liste des factures ouvertes" - -#. module: account_financial_report_webkit -#: constraint:account.account:0 -msgid "Error ! You can not create recursive accounts." -msgstr "Erreur ! Vous ne pouvez pas créer de comptes récursifs." - #. module: account_financial_report_webkit #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:33 -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:37 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:46 +#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:39 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:49 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:34 +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:29 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:58 msgid "Periods Filter" msgstr "Filtre par période" #. module: account_financial_report_webkit #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:38 -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:139 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:52 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:142 +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:143 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:55 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:148 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:39 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:153 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:50 @@ -274,34 +267,30 @@ msgid "Initial Balance" msgstr "Solde à nouveau" #. module: account_financial_report_webkit -#: field:account.common.balance.report,period_to:0 -#: field:general.ledger.webkit,period_to:0 -#: field:open.invoices.webkit,period_to:0 -#: field:partner.balance.webkit,period_to:0 -#: field:partners.ledger.webkit,period_to:0 -#: field:trial.balance.webkit,period_to:0 -msgid "End period" -msgstr "Période Fin" - -#. module: account_financial_report_webkit -#: model:ir.model,name:account_financial_report_webkit.model_account_report_general_ledger_webkit +#: model:ir.model,name:account_financial_report_webkit.model_general_ledger_webkit msgid "General Ledger Report" -msgstr "Grand livre des comptes" +msgstr "Grand livre" #. module: account_financial_report_webkit #: constraint:open.invoices.webkit:0 msgid "Clearance date must be the very last date of the last period or later." msgstr "La date d'apurement doit être postérieure à la date de fin sélectionnée." +#. module: account_financial_report_webkit +#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:132 +#, python-format +msgid "Webkit error" +msgstr "Webkit error" + #. module: account_financial_report_webkit #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:48 msgid "Displayed Accounts" msgstr "Comptes filtrés" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:99 -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:112 +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:101 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:108 +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:86 msgid "Partner" msgstr "Partenaire" @@ -311,6 +300,7 @@ msgstr "Partenaire" #: help:open.invoices.webkit,chart_account_id:0 #: help:partner.balance.webkit,chart_account_id:0 #: help:partners.ledger.webkit,chart_account_id:0 +#: help:print.journal.webkit,chart_account_id:0 #: help:trial.balance.webkit,chart_account_id:0 msgid "Select Charts of Accounts" msgstr "Selection du Plan comptable" @@ -321,28 +311,22 @@ msgstr "Selection du Plan comptable" #: field:open.invoices.webkit,filter:0 #: field:partner.balance.webkit,filter:0 #: field:partners.ledger.webkit,filter:0 +#: field:print.journal.webkit,filter:0 #: field:trial.balance.webkit,filter:0 msgid "Filter by" msgstr "Filtrer par" #. module: account_financial_report_webkit -#: view:partners.ledger.webkit:0 -#: code:addons/account_financial_report_webkit/report/partners_ledger.py:48 -#, python-format -msgid "Partner Ledger" -msgstr "Livre des tiers" - -#. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:114 -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:129 +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:116 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:123 +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:97 msgid "Curr." msgstr "Dev." #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:101 -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:114 +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:103 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:110 +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:88 msgid "Label" msgstr "Description" @@ -355,17 +339,17 @@ msgid "Only selected accounts will be printed. Leave empty to print all accounts msgstr "Seuls les comptes selectionnés seront imprimés. Laisser vide pour les imprimer tous." #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:105 -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:120 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:145 +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:107 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:151 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:114 +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:90 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:111 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:126 msgid "Debit" msgstr "Débit" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:173 +#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:181 #, python-format msgid "Please set a header in company settings" msgstr "Veuillez paramétrer un en-tête dans la société" @@ -380,13 +364,20 @@ msgid "Time Filters" msgstr "Filtre de temps" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:188 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:219 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:224 msgid "Cumulated Balance on Partner" msgstr "Totaux" #. module: account_financial_report_webkit -#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_partner_balance_menu_webkit +#: help:account.common.balance.report,filter:0 +#: help:open.invoices.webkit,filter:0 +#: help:partner.balance.webkit,filter:0 +#: help:partners.ledger.webkit,filter:0 +#: help:trial.balance.webkit,filter:0 +msgid "Filter by date: no opening balance will be displayed. (opening balance can only be computed based on period to be correct)." +msgstr "Filter by date: no opening balance will be displayed. (opening balance can only be computed based on period to be correct)." + +#. module: account_financial_report_webkit #: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_partner_balance_webkit msgid "Partner Balance Webkit" msgstr "Balance des tiers" @@ -407,17 +398,10 @@ msgstr "La date d'apurement est une aide pour le calcule de la provision sur com "" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:40 +#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:42 msgid "Clearance Date" msgstr "Date d'apurement" -#. module: account_financial_report_webkit -#: selection:general.ledger.webkit,display_account:0 -#: code:addons/account_financial_report_webkit/report/common_reports.py:62 -#, python-format -msgid "With transactions or non zero balance" -msgstr "Compte mouvementé ou dont le solde n'est pas nul" - #. module: account_financial_report_webkit #: view:partners.ledger.webkit:0 msgid "This report allows you to print or generate a pdf of your partner ledger with details of all your payable/receivable account" @@ -426,12 +410,22 @@ msgstr "Cet état imprime tout les mouvements comptables par partenaire (client #. module: account_financial_report_webkit #: selection:account.common.balance.report,display_account:0 #: selection:partner.balance.webkit,display_account:0 +#: selection:print.journal.webkit,display_account:0 #: selection:trial.balance.webkit,display_account:0 msgid "With balance is not equal to 0" msgstr "Compte dont le solde n'est pas 0" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:94 +#: view:general.ledger.webkit:0 +#: view:open.invoices.webkit:0 +#: view:partner.balance.webkit:0 +#: view:partners.ledger.webkit:0 +#: view:trial.balance.webkit:0 +msgid "[('fiscalyear_id', '=', fiscalyear_id), ('special', '=', False)]" +msgstr "[('fiscalyear_id', '=', fiscalyear_id), ('special', '=', False)]" + +#. module: account_financial_report_webkit +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:97 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:104 msgid "Fiscal Year :" msgstr "Excercice comptable :" @@ -442,26 +436,36 @@ msgid "This report allows you to print or generate a pdf of your open invoices p msgstr "Cet état vous permet d'éditer la listes de factures ouvertes à la date de votre choix" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/common_reports.py:416 +#: code:addons/account_financial_report_webkit/report/common_reports.py:424 #, python-format msgid "Must be in include_opening, exclude_opening" msgstr "Doit être dans include_opening, exclude_opening" +#. module: account_financial_report_webkit +#: view:general.ledger.webkit:0 +#: view:open.invoices.webkit:0 +#: view:partner.balance.webkit:0 +#: view:partners.ledger.webkit:0 +#: view:trial.balance.webkit:0 +msgid "True" +msgstr "True" + #. module: account_financial_report_webkit #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:43 -#: code:addons/account_financial_report_webkit/wizard/balance_common.py:163 +#: code:addons/account_financial_report_webkit/wizard/balance_common.py:176 #, python-format msgid "Dates" msgstr "Dates" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:136 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:144 msgid "Code / Ref" msgstr "Compte / Réf." #. module: account_financial_report_webkit +#: code:addons/account_financial_report_webkit/report/trial_balance.py:51 +#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_trial_balance_menu_webkit #: view:trial.balance.webkit:0 -#: code:addons/account_financial_report_webkit/report/trial_balance.py:49 #, python-format msgid "Trial Balance" msgstr "Balance des comptes" @@ -471,6 +475,26 @@ msgstr "Balance des comptes" msgid "Dates : " msgstr "Dates : " +#. module: account_financial_report_webkit +#: field:account.common.balance.report,comp0_period_to:0 +#: field:account.common.balance.report,comp1_period_to:0 +#: field:account.common.balance.report,comp2_period_to:0 +#: field:account.common.balance.report,period_to:0 +#: field:general.ledger.webkit,period_to:0 +#: field:open.invoices.webkit,period_to:0 +#: field:partner.balance.webkit,comp0_period_to:0 +#: field:partner.balance.webkit,comp1_period_to:0 +#: field:partner.balance.webkit,comp2_period_to:0 +#: field:partner.balance.webkit,period_to:0 +#: field:partners.ledger.webkit,period_to:0 +#: field:print.journal.webkit,period_to:0 +#: field:trial.balance.webkit,comp0_period_to:0 +#: field:trial.balance.webkit,comp1_period_to:0 +#: field:trial.balance.webkit,comp2_period_to:0 +#: field:trial.balance.webkit,period_to:0 +msgid "End Period" +msgstr "End Period" + #. module: account_financial_report_webkit #: model:ir.model,name:account_financial_report_webkit.model_account_common_balance_report msgid "Common Balance Report" @@ -478,31 +502,42 @@ msgstr "Common Balance Report" #. module: account_financial_report_webkit #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:36 -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:41 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:49 +#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:43 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:52 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:37 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:61 msgid "Accounts Filter" msgstr "Filtre par compte" #. module: account_financial_report_webkit -#: field:account.common.balance.report,chart_account_id:0 -#: field:general.ledger.webkit,chart_account_id:0 -#: field:open.invoices.webkit,chart_account_id:0 -#: field:partner.balance.webkit,chart_account_id:0 -#: field:partners.ledger.webkit,chart_account_id:0 -#: field:trial.balance.webkit,chart_account_id:0 -msgid "Chart of account" -msgstr "Plan comptable" +#: selection:account.common.balance.report,comp0_filter:0 +#: selection:account.common.balance.report,comp1_filter:0 +#: selection:account.common.balance.report,comp2_filter:0 +#: selection:account.common.balance.report,filter:0 +#: selection:partner.balance.webkit,comp0_filter:0 +#: selection:partner.balance.webkit,comp1_filter:0 +#: selection:partner.balance.webkit,comp2_filter:0 +#: selection:partner.balance.webkit,filter:0 +#: selection:trial.balance.webkit,comp0_filter:0 +#: selection:trial.balance.webkit,comp1_filter:0 +#: selection:trial.balance.webkit,comp2_filter:0 +#: selection:trial.balance.webkit,filter:0 +msgid "Opening Only" +msgstr "Balance d'ouverture" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:65 +#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:67 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:60 msgid "Custom Filter" msgstr "Filtre personalisé" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:90 +#: model:ir.model,name:account_financial_report_webkit.model_print_journal_webkit +msgid "Journals Report" +msgstr "Journals Report" + +#. module: account_financial_report_webkit +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:93 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:100 msgid "Dates Filter:" msgstr "Filtre Dates:" @@ -515,50 +550,55 @@ msgstr "Excercice comptable : " #. module: account_financial_report_webkit #: selection:account.common.balance.report,display_account:0 #: selection:partner.balance.webkit,display_account:0 +#: selection:print.journal.webkit,display_account:0 #: selection:trial.balance.webkit,display_account:0 msgid "With movements" msgstr "Mouvementé" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:109 -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:124 +#: view:open.invoices.webkit:0 +msgid "onchange_period_to(fiscalyear_id, period_to, date_to, until_date)" +msgstr "onchange_period_to(fiscalyear_id, period_to, date_to, until_date)" + +#. module: account_financial_report_webkit +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:111 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:118 msgid "Cumul. Bal." msgstr "Solde Cumul." #. module: account_financial_report_webkit #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:22 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:35 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:38 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:23 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:47 msgid "Computed" msgstr "Calculé" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/general_ledger.py:64 -#: code:addons/account_financial_report_webkit/report/open_invoices.py:63 +#: code:addons/account_financial_report_webkit/report/general_ledger.py:65 +#: code:addons/account_financial_report_webkit/report/open_invoices.py:76 #: code:addons/account_financial_report_webkit/report/partner_balance.py:63 #: code:addons/account_financial_report_webkit/report/partners_ledger.py:64 -#: code:addons/account_financial_report_webkit/report/profit_loss.py:71 -#: code:addons/account_financial_report_webkit/report/trial_balance.py:64 -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:67 +#: code:addons/account_financial_report_webkit/report/print_journal.py:65 +#: code:addons/account_financial_report_webkit/report/trial_balance.py:66 #, python-format msgid "of" msgstr "de" #. module: account_financial_report_webkit +#: code:addons/account_financial_report_webkit/report/common_reports.py:76 #: selection:open.invoices.webkit,result_selection:0 #: selection:partner.balance.webkit,result_selection:0 #: selection:partners.ledger.webkit,result_selection:0 -#: code:addons/account_financial_report_webkit/report/common_reports.py:71 #, python-format msgid "Payable Accounts" msgstr "Comptes fournisseur" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/open_invoices.py:48 +#: code:addons/account_financial_report_webkit/report/open_invoices.py:61 +#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_open_invoices_menu_webkit #: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_open_invoices_webkit -#: model:ir.model,name:account_financial_report_webkit.model_account_report_open_invoices_webkit +#: model:ir.model,name:account_financial_report_webkit.model_open_invoices_webkit #, python-format msgid "Open Invoices Report" msgstr "Etat des factures ouvertes" @@ -569,56 +609,76 @@ msgid "Centralized" msgstr "Centralisé" #. module: account_financial_report_webkit -#: field:account.common.balance.report,display_account:0 #: field:general.ledger.webkit,display_account:0 -#: field:partner.balance.webkit,display_account:0 -#: field:trial.balance.webkit,display_account:0 msgid "Display accounts" msgstr "Comptes affichés" #. module: account_financial_report_webkit -#: view:account.move.line:0 -msgid "Narration" -msgstr "Historique" +#: code:addons/account_financial_report_webkit/report/partner_balance.py:40 +#, python-format +msgid "PARTNER BALANCE" +msgstr "BALANCE DES TIERS" #. module: account_financial_report_webkit +#: field:account.common.balance.report,comp0_date_from:0 +#: field:account.common.balance.report,comp1_date_from:0 +#: field:account.common.balance.report,comp2_date_from:0 #: field:account.common.balance.report,date_from:0 #: field:general.ledger.webkit,date_from:0 #: field:open.invoices.webkit,date_from:0 +#: field:partner.balance.webkit,comp0_date_from:0 +#: field:partner.balance.webkit,comp1_date_from:0 +#: field:partner.balance.webkit,comp2_date_from:0 #: field:partner.balance.webkit,date_from:0 #: field:partners.ledger.webkit,date_from:0 +#: field:print.journal.webkit,date_from:0 +#: field:trial.balance.webkit,comp0_date_from:0 +#: field:trial.balance.webkit,comp1_date_from:0 +#: field:trial.balance.webkit,comp2_date_from:0 #: field:trial.balance.webkit,date_from:0 msgid "Start Date" msgstr "Date Début" #. module: account_financial_report_webkit #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:22 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:35 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:38 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:23 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:47 msgid "Opening Entries" msgstr "Basé sur l'écriture d'ouverture" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/general_ledger.py:40 +#: code:addons/account_financial_report_webkit/report/general_ledger.py:41 #, python-format msgid "GENERAL LEDGER" msgstr "GRAND LIVRE DES COMPTES" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/wizard/profit_loss_wizard.py:131 +#: selection:account.common.balance.report,target_move:0 +#: code:addons/account_financial_report_webkit/report/common_reports.py:87 +#: selection:general.ledger.webkit,target_move:0 +#: selection:open.invoices.webkit,target_move:0 +#: selection:partner.balance.webkit,target_move:0 +#: selection:partners.ledger.webkit,target_move:0 +#: selection:print.journal.webkit,target_move:0 +#: selection:trial.balance.webkit,target_move:0 #, python-format -msgid "Level %s" -msgstr "Niveau %s" +msgid "All Entries" +msgstr "Ecritures validées + brouillon" #. module: account_financial_report_webkit #: help:account.account,centralized:0 msgid "If flagged, no details will be displayed in the General Ledger report (the webkit one only), only centralized amounts per period." msgstr "Si coché, les mouvements de ce compte seront groupés par période." +#. module: account_financial_report_webkit +#: field:open.invoices.webkit,group_by_currency:0 +msgid "Group Partner by currency" +msgstr "Group Partner by currency" + #. module: account_financial_report_webkit #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:22 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:35 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:38 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:23 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:77 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:94 @@ -627,19 +687,32 @@ msgid "No" msgstr "Non" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:97 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:100 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:94 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:107 msgid "Initial Balance:" msgstr "Solde à nouveau:" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:163 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:169 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:129 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:144 msgid "Balance C%s" msgstr "Solde C%s" +#. module: account_financial_report_webkit +#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:133 +#, python-format +msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s" +msgstr "The command 'wkhtmltopdf' failed with error code = %s. Message: %s" + +#. module: account_financial_report_webkit +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:95 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:104 +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:80 +msgid "Entry" +msgstr "Ecriture" + #. module: account_financial_report_webkit #: field:account.move.line,last_rec_date:0 msgid "Last reconciliation date" @@ -653,8 +726,9 @@ msgid "Filter on partner" msgstr "Filtre sur partenaire" #. module: account_financial_report_webkit +#: code:addons/account_financial_report_webkit/report/general_ledger.py:48 #: view:general.ledger.webkit:0 -#: code:addons/account_financial_report_webkit/report/general_ledger.py:47 +#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_general_ledger_menu_webkit #, python-format msgid "General Ledger" msgstr "Grand livre des comptes" @@ -670,10 +744,10 @@ msgid "Periods : " msgstr "Periodes : " #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/partner_balance.py:40 +#: code:addons/account_financial_report_webkit/report/print_journal.py:41 #, python-format -msgid "PARTNER BALANCE" -msgstr "BALANCE DES TIERS" +msgid "JOURNALS" +msgstr "JOURNALS" #. module: account_financial_report_webkit #: help:open.invoices.webkit,partner_ids:0 @@ -683,21 +757,36 @@ msgid "Only selected partners will be printed. Leave empty to print all partners msgstr "Selectionnez les partenaires à imprimer ou laissez vide pour les imprimer tous." #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:167 +#: view:open.invoices.webkit:0 +msgid "onchange_fiscalyear(fiscalyear_id, period_to, date_to, until_date)" +msgstr "onchange_fiscalyear(fiscalyear_id, period_to, date_to, until_date)" + +#. module: account_financial_report_webkit +#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:175 #, python-format msgid "Webkit Report template not found !" msgstr "Webkit Report template not found !" #. module: account_financial_report_webkit +#: selection:account.common.balance.report,comp0_filter:0 +#: selection:account.common.balance.report,comp1_filter:0 +#: selection:account.common.balance.report,comp2_filter:0 #: selection:account.common.balance.report,filter:0 +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:91 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:100 +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:78 #: selection:general.ledger.webkit,filter:0 #: selection:open.invoices.webkit,filter:0 +#: selection:partner.balance.webkit,comp0_filter:0 +#: selection:partner.balance.webkit,comp1_filter:0 +#: selection:partner.balance.webkit,comp2_filter:0 #: selection:partner.balance.webkit,filter:0 #: selection:partners.ledger.webkit,filter:0 +#: selection:print.journal.webkit,filter:0 +#: selection:trial.balance.webkit,comp0_filter:0 +#: selection:trial.balance.webkit,comp1_filter:0 +#: selection:trial.balance.webkit,comp2_filter:0 #: selection:trial.balance.webkit,filter:0 -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:91 -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:104 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:100 msgid "Date" msgstr "Date" @@ -706,71 +795,67 @@ msgstr "Date" msgid "Uncheck to display all the details of centralized accounts." msgstr "Décocher pour afficher ne pas activer la centralisation des comptes." -#. module: account_financial_report_webkit -#: constraint:account.move.line:0 -msgid "Company must be same for its related account and period." -msgstr "La société doit être la même pour les comptes et périodes liées." - #. module: account_financial_report_webkit #: constraint:account.common.balance.report:0 #: constraint:general.ledger.webkit:0 +#: constraint:open.invoices.webkit:0 #: constraint:partner.balance.webkit:0 #: constraint:partners.ledger.webkit:0 +#: constraint:print.journal.webkit:0 #: constraint:trial.balance.webkit:0 msgid "When no Fiscal year is selected, you must choose to filter by periods or by date." msgstr "When no Fiscal year is selected, you must choose to filter by periods or by date." #. module: account_financial_report_webkit #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:50 -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:55 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:64 +#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:57 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:67 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:51 +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:45 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:62 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:75 msgid "To:" msgstr "A:" #. module: account_financial_report_webkit -#: sql_constraint:account.account:0 -msgid "The code of the account must be unique per company !" -msgstr "Le code du compte doit être unique par société." - -#. module: account_financial_report_webkit +#: model:ir.ui.menu,name:account_financial_report_webkit.menu_account_open_invoices #: view:open.invoices.webkit:0 -#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_open_invoices_menu_webkit msgid "Open Invoices" -msgstr "Factures ouvertes" +msgstr "Etat des factures ouvertes" #. module: account_financial_report_webkit #: selection:account.common.balance.report,target_move:0 +#: code:addons/account_financial_report_webkit/report/common_reports.py:85 #: selection:general.ledger.webkit,target_move:0 #: selection:open.invoices.webkit,target_move:0 #: selection:partner.balance.webkit,target_move:0 #: selection:partners.ledger.webkit,target_move:0 +#: selection:print.journal.webkit,target_move:0 #: selection:trial.balance.webkit,target_move:0 -#: code:addons/account_financial_report_webkit/report/common_reports.py:80 #, python-format msgid "All Posted Entries" msgstr "Ecritures validées" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:87 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:90 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:84 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:97 -#: code:addons/account_financial_report_webkit/wizard/balance_common.py:156 +#: code:addons/account_financial_report_webkit/wizard/balance_common.py:153 #, python-format msgid "Comparison %s" msgstr "Comparaison %s" #. module: account_financial_report_webkit #: selection:account.common.balance.report,display_account:0 -#: selection:general.ledger.webkit,display_account:0 -#: selection:partner.balance.webkit,display_account:0 -#: selection:trial.balance.webkit,display_account:0 #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:61 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:75 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:78 +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:56 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:73 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:86 +#: selection:general.ledger.webkit,display_account:0 +#: selection:partner.balance.webkit,display_account:0 +#: selection:print.journal.webkit,display_account:0 +#: selection:trial.balance.webkit,display_account:0 msgid "All" msgstr "Tous" @@ -780,20 +865,21 @@ msgstr "Tous" #: help:open.invoices.webkit,fiscalyear_id:0 #: help:partner.balance.webkit,fiscalyear_id:0 #: help:partners.ledger.webkit,fiscalyear_id:0 +#: help:print.journal.webkit,fiscalyear_id:0 #: help:trial.balance.webkit,fiscalyear_id:0 msgid "Keep empty for all open fiscal year" msgstr "Laisser vide pour selectionner tout les excercices" #. module: account_financial_report_webkit -#: help:account.move.line,last_rec_date:0 -msgid "the date of the last reconciliation (full or partial) account move line" -msgstr "Date du léttrage le plus récent (total ou partiel) c'est à dire du dernier paiement" +#: view:print.journal.webkit:0 +msgid "This report allows you to print or generate a pdf of your print journal with details of all your account journals" +msgstr "This report allows you to print or generate a pdf of your print journal with details of all your account journals" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:107 -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:122 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:147 +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:109 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:153 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:116 +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:92 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:113 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:128 msgid "Credit" @@ -805,60 +891,59 @@ msgstr "Crédit" #: selection:open.invoices.webkit,filter:0 #: selection:partner.balance.webkit,filter:0 #: selection:partners.ledger.webkit,filter:0 +#: selection:print.journal.webkit,filter:0 #: selection:trial.balance.webkit,filter:0 msgid "No Filters" msgstr "Pas de filtre" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/open_invoices.py:102 -#: code:addons/account_financial_report_webkit/report/partners_ledger.py:102 +#: code:addons/account_financial_report_webkit/report/common_reports.py:353 +#: code:addons/account_financial_report_webkit/report/open_invoices.py:127 +#: code:addons/account_financial_report_webkit/report/partners_ledger.py:112 #, python-format msgid "Error" msgstr "Erreur" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:152 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:158 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:118 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:133 msgid "Balance" msgstr "Solde" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:103 +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:105 msgid "Counter part" msgstr "Contrepartie" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:168 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:174 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:134 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:149 msgid "% Difference" msgstr "% Différence" #. module: account_financial_report_webkit -#: help:account.common.balance.report,filter:0 -#: help:open.invoices.webkit,filter:0 -#: help:partner.balance.webkit,filter:0 -#: help:partners.ledger.webkit,filter:0 -#: help:trial.balance.webkit,filter:0 -msgid "Filter by date : no opening balance will be displayed. (opening balance can only be calculated based on period to be correct)." -msgstr "Filtre par date : pas de solde initiale calculé. (il ne peut etre correct que sur filtre par périod et une écriture peut avoir une date en dehors de sa période)." +#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:117 +msgid "Code" +msgstr "Code" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/common_reports.py:313 +#: code:addons/account_financial_report_webkit/report/common_reports.py:314 #, python-format msgid "No period found" msgstr "Pas de période trouvée" #. module: account_financial_report_webkit -#: view:partner.balance.webkit:0 #: code:addons/account_financial_report_webkit/report/partner_balance.py:47 +#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_partner_balance_menu_webkit +#: view:partner.balance.webkit:0 #, python-format msgid "Partner Balance" msgstr "Balance des tiers" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/general_ledger.py:146 +#: code:addons/account_financial_report_webkit/report/general_ledger.py:149 #, python-format msgid "Centralized Entries" msgstr "Ecritures centralisées" @@ -872,99 +957,106 @@ msgstr "Filtre par compte" #. module: account_financial_report_webkit #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:31 -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:35 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:44 +#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:37 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:47 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:32 +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:27 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:56 msgid "Dates Filter" msgstr "Filtre par date" #. module: account_financial_report_webkit -#: field:account.common.balance.report,fiscalyear_id:0 -#: field:general.ledger.webkit,fiscalyear_id:0 -#: field:open.invoices.webkit,fiscalyear_id:0 -#: field:partner.balance.webkit,fiscalyear_id:0 -#: field:partners.ledger.webkit,fiscalyear_id:0 -#: field:trial.balance.webkit,fiscalyear_id:0 -msgid "Fiscal year" -msgstr "Excercice comptable" +#: code:addons/account_financial_report_webkit/report/common_reports.py:67 +#: selection:general.ledger.webkit,display_account:0 +#, python-format +msgid "With transactions or non zero balance" +msgstr "Compte mouvementé ou dont le solde n'est pas nul" #. module: account_financial_report_webkit +#: selection:account.common.balance.report,comp0_filter:0 +#: selection:account.common.balance.report,comp1_filter:0 +#: selection:account.common.balance.report,comp2_filter:0 #: selection:account.common.balance.report,filter:0 +#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:45 +#: code:addons/account_financial_report_webkit/wizard/balance_common.py:193 #: selection:general.ledger.webkit,filter:0 #: selection:open.invoices.webkit,filter:0 +#: selection:partner.balance.webkit,comp0_filter:0 +#: selection:partner.balance.webkit,comp1_filter:0 +#: selection:partner.balance.webkit,comp2_filter:0 #: selection:partner.balance.webkit,filter:0 #: selection:partners.ledger.webkit,filter:0 +#: view:print.journal.webkit:0 +#: selection:print.journal.webkit,filter:0 +#: selection:trial.balance.webkit,comp0_filter:0 +#: selection:trial.balance.webkit,comp1_filter:0 +#: selection:trial.balance.webkit,comp2_filter:0 #: selection:trial.balance.webkit,filter:0 -#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:45 -#: code:addons/account_financial_report_webkit/wizard/balance_common.py:168 #, python-format msgid "Periods" msgstr "Periodes" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:112 -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:127 +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:114 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:121 +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:95 msgid "Curr. Balance" msgstr "Solde Devise" #. module: account_financial_report_webkit #: model:ir.model,name:account_financial_report_webkit.model_account_move_line msgid "Journal Items" -msgstr "Lignes d'écriture" +msgstr "Écritures comptables" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/common_reports.py:416 +#: code:addons/account_financial_report_webkit/report/common_reports.py:424 #, python-format msgid "Invalid query mode" msgstr "Mode de recherche invalide" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/open_invoices.py:161 +#: code:addons/account_financial_report_webkit/report/open_invoices.py:188 #, python-format msgid "Unsuported filter" msgstr "Filter non supporté" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/common_reports.py:60 +#: code:addons/account_financial_report_webkit/report/common_reports.py:65 #, python-format msgid "All accounts" msgstr "Tout les comptes" +#. module: account_financial_report_webkit +#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:128 +#, python-format +msgid "No diagnosis message was provided" +msgstr "No diagnosis message was provided" + #. module: account_financial_report_webkit #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:93 -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:106 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:102 msgid "Period" msgstr "Periode" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/common_reports.py:424 +#: code:addons/account_financial_report_webkit/report/common_reports.py:432 #, python-format msgid "No valid filter" msgstr "Pas de filtre valide" #. module: account_financial_report_webkit -#: model:ir.ui.menu,name:account_financial_report_webkit.menu_account_open_invoices -msgid "Open Invoices" -msgstr "Etat des factures ouvertes" +#: view:partner.balance.webkit:0 +#: view:trial.balance.webkit:0 +msgid "{'required': [('filter', '=', 'filter_opening')]}" +msgstr "{'required': [('filter', '=', 'filter_opening')]}" #. module: account_financial_report_webkit #: view:open.invoices.webkit:0 msgid "Clearance Analysis Options" msgstr "Option d'analyse d'apurement de compte tiers" -#. module: account_financial_report_webkit -#: selection:account.common.balance.report,filter:0 -#: selection:partner.balance.webkit,filter:0 -#: selection:trial.balance.webkit,filter:0 -msgid "Opening Only" -msgstr "Balance d'ouverture" - #. module: account_financial_report_webkit #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:97 -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:110 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:106 msgid "Journal" msgstr "Journal" @@ -973,6 +1065,7 @@ msgstr "Journal" #: field:general.ledger.webkit,amount_currency:0 #: field:open.invoices.webkit,amount_currency:0 #: field:partners.ledger.webkit,amount_currency:0 +#: field:print.journal.webkit,amount_currency:0 msgid "With Currency" msgstr "Avec devise" @@ -989,23 +1082,25 @@ msgid "This report allows you to print or generate a pdf of your general ledger msgstr "Cet etat vous permet d'éditer l'ensemble des écritures comptables par compte (Rq: pensez à centraliser certains comptes pour réduire le nombre de pages)" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/profit_loss.py:42 -#, python-format -msgid "PROFIT AND LOSS" -msgstr "PROFIT AND LOSS" - -#. module: account_financial_report_webkit +#: field:account.common.balance.report,chart_account_id:0 #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:27 -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:31 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:40 +#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:33 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:43 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:28 +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:23 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:39 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:52 +#: field:general.ledger.webkit,chart_account_id:0 +#: field:open.invoices.webkit,chart_account_id:0 +#: field:partner.balance.webkit,chart_account_id:0 +#: field:partners.ledger.webkit,chart_account_id:0 +#: field:print.journal.webkit,chart_account_id:0 +#: field:trial.balance.webkit,chart_account_id:0 msgid "Chart of Account" msgstr "Plan comptable" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:167 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:173 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:133 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:148 msgid "Difference" @@ -1013,49 +1108,82 @@ msgstr "Différence" #. module: account_financial_report_webkit #: field:account.common.balance.report,target_move:0 +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:37 +#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:44 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:54 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:38 +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:33 +#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:49 +#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:62 #: field:general.ledger.webkit,target_move:0 #: field:open.invoices.webkit,target_move:0 #: field:partner.balance.webkit,target_move:0 #: field:partners.ledger.webkit,target_move:0 +#: field:print.journal.webkit,target_move:0 #: field:trial.balance.webkit,target_move:0 -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:37 -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:42 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:51 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:38 -#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:49 -#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:62 msgid "Target Moves" msgstr "Filtre d'écritures" #. module: account_financial_report_webkit #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:44 -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:49 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:58 +#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:51 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:61 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:45 +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:39 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:56 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:69 msgid "From:" msgstr "Depuis:" #. module: account_financial_report_webkit +#: field:account.common.balance.report,comp0_date_to:0 +#: field:account.common.balance.report,comp1_date_to:0 +#: field:account.common.balance.report,comp2_date_to:0 #: field:account.common.balance.report,date_to:0 #: field:general.ledger.webkit,date_to:0 #: field:open.invoices.webkit,date_to:0 +#: field:partner.balance.webkit,comp0_date_to:0 +#: field:partner.balance.webkit,comp1_date_to:0 +#: field:partner.balance.webkit,comp2_date_to:0 #: field:partner.balance.webkit,date_to:0 #: field:partners.ledger.webkit,date_to:0 +#: field:print.journal.webkit,date_to:0 +#: field:trial.balance.webkit,comp0_date_to:0 +#: field:trial.balance.webkit,comp1_date_to:0 +#: field:trial.balance.webkit,comp2_date_to:0 #: field:trial.balance.webkit,date_to:0 msgid "End Date" msgstr "Date Fin" +#. module: account_financial_report_webkit +#: field:account.common.balance.report,comp0_period_from:0 +#: field:account.common.balance.report,comp1_period_from:0 +#: field:account.common.balance.report,comp2_period_from:0 +#: field:account.common.balance.report,period_from:0 +#: field:general.ledger.webkit,period_from:0 +#: field:open.invoices.webkit,period_from:0 +#: field:partner.balance.webkit,comp0_period_from:0 +#: field:partner.balance.webkit,comp1_period_from:0 +#: field:partner.balance.webkit,comp2_period_from:0 +#: field:partner.balance.webkit,period_from:0 +#: field:partners.ledger.webkit,period_from:0 +#: field:print.journal.webkit,period_from:0 +#: field:trial.balance.webkit,comp0_period_from:0 +#: field:trial.balance.webkit,comp1_period_from:0 +#: field:trial.balance.webkit,comp2_period_from:0 +#: field:trial.balance.webkit,period_from:0 +msgid "Start Period" +msgstr "Start Period" + #. module: account_financial_report_webkit #: field:open.invoices.webkit,until_date:0 msgid "Clearance date" msgstr "Date d'apurement" #. module: account_financial_report_webkit -#: model:ir.model,name:account_financial_report_webkit.model_account_report_partners_ledger_webkit +#: model:ir.model,name:account_financial_report_webkit.model_partners_ledger_webkit msgid "Partner Ledger Report" -msgstr "Livre des tiers" +msgstr "Partner Ledger Report" #. module: account_financial_report_webkit #: view:open.invoices.webkit:0 @@ -1065,96 +1193,131 @@ msgid "Partners Filters" msgstr "Filtre Partenaire" #. module: account_financial_report_webkit +#: selection:account.common.balance.report,comp0_filter:0 +#: field:account.common.balance.report,comp0_fiscalyear_id:0 +#: selection:account.common.balance.report,comp1_filter:0 +#: field:account.common.balance.report,comp1_fiscalyear_id:0 +#: selection:account.common.balance.report,comp2_filter:0 +#: field:account.common.balance.report,comp2_fiscalyear_id:0 +#: field:account.common.balance.report,fiscalyear_id:0 #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:28 -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:32 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:41 +#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:34 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:44 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:29 +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:24 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:40 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:53 +#: field:general.ledger.webkit,fiscalyear_id:0 +#: field:open.invoices.webkit,fiscalyear_id:0 +#: selection:partner.balance.webkit,comp0_filter:0 +#: field:partner.balance.webkit,comp0_fiscalyear_id:0 +#: selection:partner.balance.webkit,comp1_filter:0 +#: field:partner.balance.webkit,comp1_fiscalyear_id:0 +#: selection:partner.balance.webkit,comp2_filter:0 +#: field:partner.balance.webkit,comp2_fiscalyear_id:0 +#: field:partner.balance.webkit,fiscalyear_id:0 +#: field:partners.ledger.webkit,fiscalyear_id:0 +#: field:print.journal.webkit,fiscalyear_id:0 +#: selection:trial.balance.webkit,comp0_filter:0 +#: field:trial.balance.webkit,comp0_fiscalyear_id:0 +#: selection:trial.balance.webkit,comp1_filter:0 +#: field:trial.balance.webkit,comp1_fiscalyear_id:0 +#: selection:trial.balance.webkit,comp2_filter:0 +#: field:trial.balance.webkit,comp2_fiscalyear_id:0 +#: field:trial.balance.webkit,fiscalyear_id:0 msgid "Fiscal Year" msgstr "Excercice comptable" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:77 -#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:94 -msgid "Yes" -msgstr "Oui" +#: selection:account.common.balance.report,comp0_filter:0 +#: selection:account.common.balance.report,comp1_filter:0 +#: selection:account.common.balance.report,comp2_filter:0 +#: selection:partner.balance.webkit,comp0_filter:0 +#: selection:partner.balance.webkit,comp1_filter:0 +#: selection:partner.balance.webkit,comp2_filter:0 +#: selection:trial.balance.webkit,comp0_filter:0 +#: selection:trial.balance.webkit,comp1_filter:0 +#: selection:trial.balance.webkit,comp2_filter:0 +msgid "No Comparison" +msgstr "No Comparison" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:95 -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:108 -#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:104 -msgid "Entry" -msgstr "Ecriture" +#: help:account.move.line,last_rec_date:0 +msgid "the date of the last reconciliation (full or partial) account move line" +msgstr "Date du léttrage le plus récent (total ou partiel) c'est à dire du dernier paiement" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/general_ledger.py:64 -#: code:addons/account_financial_report_webkit/report/open_invoices.py:63 +#: code:addons/account_financial_report_webkit/report/general_ledger.py:65 +#: code:addons/account_financial_report_webkit/report/open_invoices.py:76 #: code:addons/account_financial_report_webkit/report/partner_balance.py:63 #: code:addons/account_financial_report_webkit/report/partners_ledger.py:64 -#: code:addons/account_financial_report_webkit/report/profit_loss.py:71 -#: code:addons/account_financial_report_webkit/report/trial_balance.py:64 -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:67 +#: code:addons/account_financial_report_webkit/report/print_journal.py:65 +#: code:addons/account_financial_report_webkit/report/trial_balance.py:66 #, python-format msgid "Page" msgstr "Page" #. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:50 +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:53 msgid "Partners Filter" msgstr "Filtre Partenaire" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/open_invoices.py:102 -#: code:addons/account_financial_report_webkit/report/partners_ledger.py:102 +#: code:addons/account_financial_report_webkit/report/open_invoices.py:127 +#: code:addons/account_financial_report_webkit/report/partners_ledger.py:112 #, python-format msgid "No accounts to print." msgstr "Aucun compte à imprimer" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/profit_loss.py:49 -#, python-format -msgid "Profit and Loss" -msgstr "Perte et profit" - -#. module: account_financial_report_webkit -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:99 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:95 msgid "No Partner" msgstr "Pas de partenaire" #. module: account_financial_report_webkit -#: code:addons/account_financial_report_webkit/report/open_invoices.py:41 +#: code:addons/account_financial_report_webkit/report/open_invoices.py:54 #, python-format msgid "OPEN INVOICES REPORT" msgstr "ETAT DES FACTURES OUVERTES" #. module: account_financial_report_webkit #: code:addons/account_financial_report_webkit/report/partners_ledger.py:41 -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:57 #, python-format msgid "PARTNER LEDGER" msgstr "LIVRE DES TIERS" #. module: account_financial_report_webkit -#: selection:account.common.balance.report,target_move:0 -#: selection:general.ledger.webkit,target_move:0 -#: selection:open.invoices.webkit,target_move:0 -#: selection:partner.balance.webkit,target_move:0 -#: selection:partners.ledger.webkit,target_move:0 -#: selection:trial.balance.webkit,target_move:0 -#: code:addons/account_financial_report_webkit/report/common_reports.py:82 +#: code:addons/account_financial_report_webkit/report/common_reports.py:354 #, python-format -msgid "All Entries" -msgstr "Ecritures validées + brouillon" +msgid "No opening period found to compute the opening balances.\n" +"You have to configure a period on the first of January with the special flag." +msgstr "No opening period found to compute the opening balances.\n" +"You have to configure a period on the first of January with the special flag." #. module: account_financial_report_webkit -#: sql_constraint:account.move.line:0 -msgid "Wrong credit or debit value in accounting entry !" -msgstr "Valeur erronée au crédit ou au débit dans l'écriture comptable !" +#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:130 +#, python-format +msgid "The following diagnosis message was provided:\n" +"" +msgstr "The following diagnosis message was provided:\n" +"" + +#. module: account_financial_report_webkit +#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:77 +#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:94 +msgid "Yes" +msgstr "Oui" #. module: account_financial_report_webkit -#: constraint:account.move.line:0 -msgid "You can not create move line on view account." -msgstr "Vous ne pouvez pas créer de ligne d'écriture sur un compte de type \"Vue\"." +#: field:account.common.balance.report,comp0_filter:0 +#: field:account.common.balance.report,comp1_filter:0 +#: field:account.common.balance.report,comp2_filter:0 +#: field:partner.balance.webkit,comp0_filter:0 +#: field:partner.balance.webkit,comp1_filter:0 +#: field:partner.balance.webkit,comp2_filter:0 +#: field:trial.balance.webkit,comp0_filter:0 +#: field:trial.balance.webkit,comp1_filter:0 +#: field:trial.balance.webkit,comp2_filter:0 +msgid "Compare By" +msgstr "Compare By" diff --git a/account_financial_report_webkit/report/__init__.py b/account_financial_report_webkit/report/__init__.py index 0934d98f..f8bc59fb 100644 --- a/account_financial_report_webkit/report/__init__.py +++ b/account_financial_report_webkit/report/__init__.py @@ -8,3 +8,4 @@ from . import webkit_parser_header_fix from . import trial_balance from . import partner_balance from . import open_invoices +from . import print_journal diff --git a/account_financial_report_webkit/report/common_reports.py b/account_financial_report_webkit/report/common_reports.py index a09b734a..105ceec2 100644 --- a/account_financial_report_webkit/report/common_reports.py +++ b/account_financial_report_webkit/report/common_reports.py @@ -56,6 +56,9 @@ class CommonReportHeaderWebkit(common_report_header): return self.pool.get(model).browse(self.cursor, self.uid, info) return False + def _get_journals_br(self, data): + return self._get_info(data, 'journal_ids', 'account.journal') + def _get_display_account(self, data): val = self._get_form_param('display_account', data) if val == 'bal_all': diff --git a/account_financial_report_webkit/report/print_journal.py b/account_financial_report_webkit/report/print_journal.py new file mode 100644 index 00000000..948417e6 --- /dev/null +++ b/account_financial_report_webkit/report/print_journal.py @@ -0,0 +1,145 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# account_financial_report_webkit module for OpenERP, Webkit based extended report financial report +# Copyright (C) 2012 SYLEAM Info Services () +# Sebastien LANGE +# +# This file is a part of account_financial_report_webkit +# +# account_financial_report_webkit 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. +# +# account_financial_report_webkit 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 report import report_sxw +from tools.translate import _ +import pooler +from datetime import datetime + +from common_reports import CommonReportHeaderWebkit +from webkit_parser_header_fix import HeaderFooterTextWebKitParser + +class PrintJournalWebkit(report_sxw.rml_parse, CommonReportHeaderWebkit): + + def __init__(self, cursor, uid, name, context): + super(PrintJournalWebkit, self).__init__(cursor, uid, name, context=context) + self.pool = pooler.get_pool(self.cr.dbname) + self.cursor = self.cr + + company = self.pool.get('res.users').browse(self.cr, uid, uid, context=context).company_id + header_report_name = ' - '.join((_('JOURNALS'), company.name, company.currency_id.name)) + + footer_date_time = self.formatLang(str(datetime.today()), date_time=True) + + self.localcontext.update({ + 'cr': cursor, + 'uid': uid, + 'report_name':_('Journals'), + 'display_account_raw': self._get_display_account_raw, + 'filter_form': self._get_filter, + 'target_move': self._get_target_move, + 'initial_balance': self._get_initial_balance, + 'amount_currency': self._get_amount_currency, + 'display_partner_account': self._get_display_partner_account, + 'display_target_move': self._get_display_target_move, + 'journals': self._get_journals_br, + 'additional_args': [ + ('--header-font-name', 'Helvetica'), + ('--footer-font-name', 'Helvetica'), + ('--header-font-size', '10'), + ('--footer-font-size', '6'), + ('--header-left', header_report_name), + ('--header-spacing', '2'), + ('--footer-left', footer_date_time), + ('--footer-right', ' '.join((_('Page'), '[page]', _('of'), '[topage]'))), + ('--footer-line',), + ], + }) + + def set_context(self, objects, data, ids, report_type=None): + """Populate a ledger_lines attribute on each browse record that will be used + by mako template""" + + # Reading form + main_filter = self._get_form_param('filter', data, default='filter_no') + target_move = self._get_form_param('target_move', data, default='all') + start_date = self._get_form_param('date_from', data) + stop_date = self._get_form_param('date_to', data) + start_period = self.get_start_period_br(data) + stop_period = self.get_end_period_br(data) + fiscalyear = self.get_fiscalyear_br(data) + journal_ids = self._get_form_param('journal_ids', data) + chart_account = self._get_chart_account_id_br(data) + account_period_obj = self.pool.get('account.period') + + domain= [('journal_id', 'in', journal_ids)] + if main_filter == 'filter_no': + domain += [ + ('date', '>=', self.get_first_fiscalyear_period(fiscalyear).date_start), + ('date', '<=', self.get_last_fiscalyear_period(fiscalyear).date_stop), + ] + # computation of move lines + elif main_filter == 'filter_date': + domain += [ + ('date', '>=', start_date), + ('date', '<=', stop_date), + ] + elif main_filter == 'filter_period': + period_ids = account_period_obj.build_ctx_periods(self.cursor, self.uid, start_period.id, stop_period.id) + domain = [ + ('period_id', 'in', period_ids), + ] + if target_move == 'posted': + domain += [('state', '=', 'posted')] + account_journal_period_obj = self.pool.get('account.journal.period') + new_ids = account_journal_period_obj.search(self.cursor, self.uid, [ + ('journal_id', 'in', journal_ids), + ('period_id', 'in', period_ids), + ]) + objects = account_journal_period_obj.browse(self.cursor, self.uid, new_ids) + # Sort by journal and period + objects.sort(key=lambda a: (a.journal_id.code, a.period_id.date_start)) + move_obj = self.pool.get('account.move') + for journal_period in objects: + domain_arg = [ + ('journal_id', '=', journal_period.journal_id.id), + ('period_id', '=', journal_period.period_id.id), + ] + if target_move == 'posted': + domain_arg += [('state', '=', 'posted')] + move_ids = move_obj.search(self.cursor, self.uid, domain_arg, order="name") + journal_period.moves = move_obj.browse(self.cursor, self.uid, move_ids) + # Sort account move line by account accountant + for move in journal_period.moves: + move.line_id.sort(key=lambda a: (a.date, a.account_id.code)) + + self.localcontext.update({ + 'fiscalyear': fiscalyear, + 'start_date': start_date, + 'stop_date': stop_date, + 'start_period': start_period, + 'stop_period': stop_period, + 'chart_account': chart_account, + }) + + return super(PrintJournalWebkit, self).set_context(objects, data, new_ids, report_type=report_type) + + + +HeaderFooterTextWebKitParser('report.account.account_report_print_journal_webkit', + 'account.journal.period', + 'addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako', + parser=PrintJournalWebkit) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/account_financial_report_webkit/report/report.xml b/account_financial_report_webkit/report/report.xml index a003e55f..f617d0bd 100644 --- a/account_financial_report_webkit/report/report.xml +++ b/account_financial_report_webkit/report/report.xml @@ -111,5 +111,25 @@ + + webkit + account.account_report_print_journal_webkit + + + + + account.move + ir.actions.report.xml + Journals + account_financial_report_webkit/report/templates/account_report_print_journal.mako + account_financial_report_webkit/report/templates/account_report_print_journal.mako + + + account_report_print_journal_webkit + + + + + diff --git a/account_financial_report_webkit/report/templates/account_report_print_journal.mako b/account_financial_report_webkit/report/templates/account_report_print_journal.mako new file mode 100644 index 00000000..c62951cc --- /dev/null +++ b/account_financial_report_webkit/report/templates/account_report_print_journal.mako @@ -0,0 +1,169 @@ + + + + + + + <%! + def amount(text): + return text.replace('-', '‑') # replace by a non-breaking hyphen (it will not word-wrap between hyphen and numbers) + %> + + <%setLang(user.lang)%> + +
+
+
${_('Chart of Account')}
+
${_('Fiscal Year')}
+
+ %if filter_form(data) == 'filter_date': + ${_('Dates Filter')} + %else: + ${_('Periods Filter')} + %endif +
+
${_('Journal Filter')}
+
${_('Target Moves')}
+
+
+
${ chart_account.name }
+
${ fiscalyear.name if fiscalyear else '-' }
+
+ ${_('From:')} + %if filter_form(data) == 'filter_date': + ${formatLang(start_date, date=True) if start_date else u'' } + %else: + ${start_period.name if start_period else u''} + %endif + ${_('To:')} + %if filter_form(data) == 'filter_date': + ${ formatLang(stop_date, date=True) if stop_date else u'' } + %else: + ${stop_period.name if stop_period else u'' } + %endif +
+
+ %if journals(data): + ${', '.join([journal.name for journal in journals(data)])} + %else: + ${_('All')} + %endif + +
+
${ display_target_move(data) }
+
+
+ + %for journal_period in objects: + <% + account_total_debit = 0.0 + account_total_credit = 0.0 + account_total_currency = 0.0 + %> + + + + +
+
+
+ ## date +
${_('Date')}
+ ## move +
${_('Entry')}
+ ## account code +
${_('Account')}
+ ## date +
${_('Due Date')}
+ ## partner +
${_('Partner')}
+ ## label +
${_('Label')}
+ ## debit +
${_('Debit')}
+ ## credit +
${_('Credit')}
+ %if amount_currency(data): + ## currency balance +
${_('Curr. Balance')}
+ ## curency code +
${_('Curr.')}
+ %endif +
+
+ %for move in journal_period.moves: + <% + new_move = True + %> + + %for line in move.line_id: +
+ <% + account_total_debit += line.debit or 0.0 + account_total_credit += line.credit or 0.0 + %> +
+ ## date +
${formatLang(move.date, date=True) if new_move else ''}
+ ## move +
${move.name if new_move else ''}
+ ## account code +
${line.account_id.code}
+ ## date +
${formatLang(line.date_maturity or '', date=True)}
+ ## partner +
${line.partner_id.name if new_move else ''}
+ ## label +
${line.name}
+ ## debit +
${formatLang(line.debit) if line.debit else ''}
+ ## credit +
${formatLang(line.credit) if line.credit else ''}
+ %if amount_currency(data): + ## currency balance +
${formatLang(line.amount_currency) if line.amount_currency else ''}
+ ## curency code +
${line.currency_id.symbol or ''}
+ %endif +
+ <% + new_move = False + %> +
+ %endfor + %endfor +
+ ## date +
+ ## move +
+ ## account code +
+ ## date +
+ ## partner +
+ ## label +
+ ## debit +
${formatLang(account_total_debit) | amount }
+ ## credit +
${formatLang(account_total_credit) | amount }
+ %if amount_currency(data): + ## currency balance +
+ ## currency code +
+ %endif +
+
+ %endfor + + diff --git a/account_financial_report_webkit/report_menus.xml b/account_financial_report_webkit/report_menus.xml index 585f839d..aeb9e0e4 100644 --- a/account_financial_report_webkit/report_menus.xml +++ b/account_financial_report_webkit/report_menus.xml @@ -22,5 +22,14 @@ parent="account.next_id_22" action="action_account_open_invoices_menu_webkit" groups="account.group_account_manager,account.group_account_user" id="menu_account_open_invoices"/> + + + + diff --git a/account_financial_report_webkit/wizard/__init__.py b/account_financial_report_webkit/wizard/__init__.py index 6d5a6f1b..bf2cc01c 100644 --- a/account_financial_report_webkit/wizard/__init__.py +++ b/account_financial_report_webkit/wizard/__init__.py @@ -2,6 +2,8 @@ ############################################################################## # # Author: Nicolas Bessi. Copyright Camptocamp SA +# Copyright (C) 2012 SYLEAM Info Services () +# Sebastien LANGE # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -24,3 +26,4 @@ from . import partners_ledger_wizard from . import trial_balance_wizard from . import partner_balance_wizard from . import open_invoices_wizard +from . import print_journal diff --git a/account_financial_report_webkit/wizard/print_journal.py b/account_financial_report_webkit/wizard/print_journal.py new file mode 100644 index 00000000..b1c86aa2 --- /dev/null +++ b/account_financial_report_webkit/wizard/print_journal.py @@ -0,0 +1,140 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# account_financial_report_webkit module for OpenERP +# Copyright (C) 2012 SYLEAM Info Services () +# Sebastien LANGE +# +# This file is a part of account_financial_report_webkit +# +# account_financial_report_webkit 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. +# +# account_financial_report_webkit 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 osv import osv +from osv import fields +import time +from lxml import etree + + +class AccountReportPrintJournalWizard(osv.osv_memory): + """Will launch print journal report and pass requiered args""" + + + _inherit = "account.common.account.report" + _name = "print.journal.webkit" + _description = "Journals Report" + + _columns = { + 'amount_currency': fields.boolean("With Currency", help="It adds the currency column"), + } + + _defaults = { + 'amount_currency': False, + 'journal_ids': False, + 'filter': 'filter_period', + } + + def _check_fiscalyear(self, cr, uid, ids, context=None): + obj = self.read(cr, uid, ids[0], ['fiscalyear_id', 'filter'], context=context) + if not obj['fiscalyear_id'] and obj['filter'] == 'filter_no': + return False + return True + + _constraints = [ + (_check_fiscalyear, 'When no Fiscal year is selected, you must choose to filter by periods or by date.', ['filter']), + ] + + def pre_print_report(self, cr, uid, ids, data, context=None): + data = super(AccountReportPrintJournalWizard, self).pre_print_report(cr, uid, ids, data, context) + # will be used to attach the report on the main account + data['ids'] = [data['form']['chart_account_id']] + vals = self.read(cr, uid, ids, + ['amount_currency', + 'display_account', + 'journal_ids'], + context=context)[0] + data['form'].update(vals) + return data + + def onchange_filter(self, cr, uid, ids, filter='filter_no', fiscalyear_id=False, context=None): + res = {} + if filter == 'filter_no': + res['value'] = {'period_from': False, 'period_to': False, 'date_from': False ,'date_to': False} + if filter == 'filter_date': + if fiscalyear_id: + fyear = self.pool.get('account.fiscalyear').browse(cr, uid, fiscalyear_id, context=context) + date_from = fyear.date_start + date_to = fyear.date_stop > time.strftime('%Y-%m-%d') and time.strftime('%Y-%m-%d') or fyear.date_stop + else: + date_from, date_to = time.strftime('%Y-01-01'), time.strftime('%Y-%m-%d') + res['value'] = {'period_from': False, 'period_to': False, 'date_from': date_from, 'date_to': date_to} + if filter == 'filter_period' and fiscalyear_id: + start_period = end_period = False + cr.execute(''' + SELECT * FROM (SELECT p.id + FROM account_period p + LEFT JOIN account_fiscalyear f ON (p.fiscalyear_id = f.id) + WHERE f.id = %s + AND COALESCE(p.special, FALSE) = FALSE + ORDER BY p.date_start ASC + LIMIT 1) AS period_start + UNION ALL + SELECT * FROM (SELECT p.id + FROM account_period p + LEFT JOIN account_fiscalyear f ON (p.fiscalyear_id = f.id) + WHERE f.id = %s + AND p.date_start < NOW() + AND COALESCE(p.special, FALSE) = FALSE + ORDER BY p.date_stop DESC + LIMIT 1) AS period_stop''', (fiscalyear_id, fiscalyear_id)) + periods = [i[0] for i in cr.fetchall()] + if periods: + start_period = end_period = periods[0] + if len(periods) > 1: + end_period = periods[1] + res['value'] = {'period_from': start_period, 'period_to': end_period, 'date_from': False, 'date_to': False} + return res + + def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): + ''' + used to set the domain on 'journal_ids' field: we exclude or only propose the journals of type + sale/purchase (+refund) accordingly to the presence of the key 'sale_purchase_only' in the context. + ''' + if context is None: + context = {} + res = super(AccountReportPrintJournalWizard, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu) + doc = etree.XML(res['arch']) + + if context.get('sale_purchase_only'): + domain ="[('type', 'in', ('sale','purchase','sale_refund','purchase_refund'))]" + else: + domain ="[('type', 'not in', ('sale','purchase','sale_refund','purchase_refund'))]" + nodes = doc.xpath("//field[@name='journal_ids']") + for node in nodes: + node.set('domain', domain) + res['arch'] = etree.tostring(doc) + return res + + def _print_report(self, cursor, uid, ids, data, context=None): + context = context or {} + # we update form with display account value + data = self.pre_print_report(cursor, uid, ids, data, context=context) + return {'type': 'ir.actions.report.xml', + 'report_name': 'account.account_report_print_journal_webkit', + 'datas': data} + +AccountReportPrintJournalWizard() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/account_financial_report_webkit/wizard/print_journal_view.xml b/account_financial_report_webkit/wizard/print_journal_view.xml new file mode 100644 index 00000000..dfe8719b --- /dev/null +++ b/account_financial_report_webkit/wizard/print_journal_view.xml @@ -0,0 +1,101 @@ + + + + ############################################################################## + # + # account_financial_report_webkit module for OpenERP, Webkit based extended report financial report + # Copyright (C) 2012 SYLEAM Info Services ([http://www.syleam.fr/]) + # Sebastien LANGE [sebastien.lange@syleam.fr] + # + # This file is a part of account_financial_report_webkit + # + # account_financial_report_webkit 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. + # + # account_financial_report_webkit 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 [http://www.gnu.org/licenses/]. + # + ############################################################################## + + + Journals + print.journal.webkit + form + + + + + + + + + + + + + + + + + + + + + + + + + + Journals + print.journal.webkit + form + + + + + + + + + + Journals + ir.actions.act_window + print.journal.webkit + form + form + + new + + + + + + Journals + client_print_multi + + action + account.journal.period + + + + Journals + ir.actions.act_window + print.journal.webkit + form + form + + {'sale_purchase_only':True} + new + + + + From b75c0617a4b6114d1b8a026f129588ddc1932097 Mon Sep 17 00:00:00 2001 From: Sebastien LANGE Date: Fri, 13 Sep 2013 12:48:50 -1000 Subject: [PATCH 2/2] [FIX] PEP8 and change get company_id --- .../report/print_journal.py | 12 +++++++----- .../wizard/print_journal.py | 9 ++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/account_financial_report_webkit/report/print_journal.py b/account_financial_report_webkit/report/print_journal.py index 948417e6..71d386de 100644 --- a/account_financial_report_webkit/report/print_journal.py +++ b/account_financial_report_webkit/report/print_journal.py @@ -30,6 +30,7 @@ from datetime import datetime from common_reports import CommonReportHeaderWebkit from webkit_parser_header_fix import HeaderFooterTextWebKitParser + class PrintJournalWebkit(report_sxw.rml_parse, CommonReportHeaderWebkit): def __init__(self, cursor, uid, name, context): @@ -37,7 +38,10 @@ class PrintJournalWebkit(report_sxw.rml_parse, CommonReportHeaderWebkit): self.pool = pooler.get_pool(self.cr.dbname) self.cursor = self.cr - company = self.pool.get('res.users').browse(self.cr, uid, uid, context=context).company_id + company_obj = self.pool.get('res.company') + + company_id = company_obj._company_default_get(self.cr, uid, 'res.users', context=context) + company = company_obj.browse(self.cr, uid, company_id, context=context) header_report_name = ' - '.join((_('JOURNALS'), company.name, company.currency_id.name)) footer_date_time = self.formatLang(str(datetime.today()), date_time=True) @@ -45,7 +49,7 @@ class PrintJournalWebkit(report_sxw.rml_parse, CommonReportHeaderWebkit): self.localcontext.update({ 'cr': cursor, 'uid': uid, - 'report_name':_('Journals'), + 'report_name': _('Journals'), 'display_account_raw': self._get_display_account_raw, 'filter_form': self._get_filter, 'target_move': self._get_target_move, @@ -83,7 +87,7 @@ class PrintJournalWebkit(report_sxw.rml_parse, CommonReportHeaderWebkit): chart_account = self._get_chart_account_id_br(data) account_period_obj = self.pool.get('account.period') - domain= [('journal_id', 'in', journal_ids)] + domain = [('journal_id', 'in', journal_ids)] if main_filter == 'filter_no': domain += [ ('date', '>=', self.get_first_fiscalyear_period(fiscalyear).date_start), @@ -135,8 +139,6 @@ class PrintJournalWebkit(report_sxw.rml_parse, CommonReportHeaderWebkit): return super(PrintJournalWebkit, self).set_context(objects, data, new_ids, report_type=report_type) - - HeaderFooterTextWebKitParser('report.account.account_report_print_journal_webkit', 'account.journal.period', 'addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako', diff --git a/account_financial_report_webkit/wizard/print_journal.py b/account_financial_report_webkit/wizard/print_journal.py index b1c86aa2..191d1daf 100644 --- a/account_financial_report_webkit/wizard/print_journal.py +++ b/account_financial_report_webkit/wizard/print_journal.py @@ -31,7 +31,6 @@ from lxml import etree class AccountReportPrintJournalWizard(osv.osv_memory): """Will launch print journal report and pass requiered args""" - _inherit = "account.common.account.report" _name = "print.journal.webkit" _description = "Journals Report" @@ -71,7 +70,7 @@ class AccountReportPrintJournalWizard(osv.osv_memory): def onchange_filter(self, cr, uid, ids, filter='filter_no', fiscalyear_id=False, context=None): res = {} if filter == 'filter_no': - res['value'] = {'period_from': False, 'period_to': False, 'date_from': False ,'date_to': False} + res['value'] = {'period_from': False, 'period_to': False, 'date_from': False, 'date_to': False} if filter == 'filter_date': if fiscalyear_id: fyear = self.pool.get('account.fiscalyear').browse(cr, uid, fiscalyear_id, context=context) @@ -99,7 +98,7 @@ class AccountReportPrintJournalWizard(osv.osv_memory): AND COALESCE(p.special, FALSE) = FALSE ORDER BY p.date_stop DESC LIMIT 1) AS period_stop''', (fiscalyear_id, fiscalyear_id)) - periods = [i[0] for i in cr.fetchall()] + periods = [i[0] for i in cr.fetchall()] if periods: start_period = end_period = periods[0] if len(periods) > 1: @@ -118,9 +117,9 @@ class AccountReportPrintJournalWizard(osv.osv_memory): doc = etree.XML(res['arch']) if context.get('sale_purchase_only'): - domain ="[('type', 'in', ('sale','purchase','sale_refund','purchase_refund'))]" + domain = "[('type', 'in', ('sale','purchase','sale_refund','purchase_refund'))]" else: - domain ="[('type', 'not in', ('sale','purchase','sale_refund','purchase_refund'))]" + domain = "[('type', 'not in', ('sale','purchase','sale_refund','purchase_refund'))]" nodes = doc.xpath("//field[@name='journal_ids']") for node in nodes: node.set('domain', domain)