Merge lp:~alnslang/account-financial-report/7.0-print-journal-webkit into lp:~account-report-core-editor/account-financial-report/7.0
- 7.0-print-journal-webkit
- Merge into 7.0
Proposed by
Sebastien LANGE - http://www.Syleam.fr
| Status: | Superseded |
|---|---|
| Proposed branch: | lp:~alnslang/account-financial-report/7.0-print-journal-webkit |
| Merge into: | lp:~account-report-core-editor/account-financial-report/7.0 |
| Diff against target: |
2236 lines (+1085/-329) 11 files modified
account_financial_report_webkit/__openerp__.py (+2/-1) account_financial_report_webkit/i18n/fr.po (+491/-328) account_financial_report_webkit/report/__init__.py (+1/-0) account_financial_report_webkit/report/common_reports.py (+3/-0) account_financial_report_webkit/report/print_journal.py (+147/-0) account_financial_report_webkit/report/report.xml (+20/-0) account_financial_report_webkit/report/templates/account_report_print_journal.mako (+169/-0) account_financial_report_webkit/report_menus.xml (+9/-0) account_financial_report_webkit/wizard/__init__.py (+3/-0) account_financial_report_webkit/wizard/print_journal.py (+139/-0) account_financial_report_webkit/wizard/print_journal_view.xml (+101/-0) |
| To merge this branch: | bzr merge lp:~alnslang/account-financial-report/7.0-print-journal-webkit |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Nicolas Bessi - Camptocamp (community) | code review, no test | Approve | |
| Frederic Clementi - Camptocamp | functional only - no code review | Approve | |
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2013-09-13.
Commit message
Description of the change
Add Journal Report in WebKit
To post a comment you must log in.
Revision history for this message
| Frederic Clementi - Camptocamp (frederic-clementi) wrote : | # |
review:
Approve
(functional only - no code review)
Revision history for this message
| Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote : | # |
Hello,
Thanks for the jobs.
Some small PEP8 problems in print_journal.py, spacing, carriage. a quick path to a linter would do the trick
I wanted to fix them myself but branch is nominative please use ~openerp-community group
line 1638: please get company using using res.company _company_
Some onchange in po files
+msgid "onchange_
+msgstr "onchange_
Seems really weird but seems to be caused by:
<field name="fiscalyea
<attribute name="on_
</field>
and is not related to the current MP
I will make a bug report for this topic.
Regards
Nicolas
review:
Needs Fixing
(code review,)
- 52. By Sebastien LANGE - http://www.Syleam.fr
-
[FIX] PEP8 and change get company_id
Revision history for this message
| Sebastien LANGE - http://www.Syleam.fr (alnslang) wrote : | # |
> Hello,
Hello,
> Thanks for the jobs.
> Some small PEP8 problems in print_journal.py, spacing, carriage. a quick path
> to a linter would do the trick
Fixed
>
> I wanted to fix them myself but branch is nominative please use ~openerp-
> community group
For next merge request ;)
>
> line 1638: please get company using using res.company _company_
> function. I know this should be fix in other places in webkit report.
Exactly, I changed it.
>
> Some onchange in po files
>
> +msgid "onchange_
> +msgstr "onchange_
>
> Seems really weird but seems to be caused by:
> <field name="fiscalyea
> <attribute name="on_
> date_to, until_date)
> </field>
>
> and is not related to the current MP
>
> I will make a bug report for this topic.
Thanks
Regards
Sebastien
Revision history for this message
| Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) : | # |
review:
Approve
(code review, no test)
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'account_financial_report_webkit/__openerp__.py' |
| 2 | --- account_financial_report_webkit/__openerp__.py 2012-12-12 10:36:14 +0000 |
| 3 | +++ account_financial_report_webkit/__openerp__.py 2013-09-13 22:49:16 +0000 |
| 4 | @@ -115,7 +115,7 @@ |
| 5 | be different when computed by data or by initial balance for the |
| 6 | period). The opening period is assumed to be the Jan. 1st of the year |
| 7 | with an opening flag and the first period of the year must start also |
| 8 | -on Jan 1st. |
| 9 | +on Jan 1st. |
| 10 | |
| 11 | Totals for amounts in currencies are effective if the partner belongs to |
| 12 | an account with a secondary currency. |
| 13 | @@ -147,6 +147,7 @@ |
| 14 | 'wizard/trial_balance_wizard_view.xml', |
| 15 | 'wizard/partner_balance_wizard_view.xml', |
| 16 | 'wizard/open_invoices_wizard_view.xml', |
| 17 | + 'wizard/print_journal_view.xml', |
| 18 | 'report_menus.xml', |
| 19 | ], |
| 20 | # tests order matter |
| 21 | |
| 22 | === modified file 'account_financial_report_webkit/i18n/fr.po' |
| 23 | --- account_financial_report_webkit/i18n/fr.po 2012-03-06 09:13:59 +0000 |
| 24 | +++ account_financial_report_webkit/i18n/fr.po 2013-09-13 22:49:16 +0000 |
| 25 | @@ -4,10 +4,10 @@ |
| 26 | # |
| 27 | msgid "" |
| 28 | msgstr "" |
| 29 | -"Project-Id-Version: OpenERP Server 6.0.3\n" |
| 30 | -"Report-Msgid-Bugs-To: support@openerp.com\n" |
| 31 | -"POT-Creation-Date: 2012-01-20 10:47+0000\n" |
| 32 | -"PO-Revision-Date: 2012-01-20 10:47+0000\n" |
| 33 | +"Project-Id-Version: OpenERP Server 7.0\n" |
| 34 | +"Report-Msgid-Bugs-To: \n" |
| 35 | +"POT-Creation-Date: 2013-09-06 12:56+0000\n" |
| 36 | +"PO-Revision-Date: 2013-09-06 12:56+0000\n" |
| 37 | "Last-Translator: <>\n" |
| 38 | "Language-Team: \n" |
| 39 | "MIME-Version: 1.0\n" |
| 40 | @@ -16,6 +16,11 @@ |
| 41 | "Plural-Forms: \n" |
| 42 | |
| 43 | #. module: account_financial_report_webkit |
| 44 | +#: view:open.invoices.webkit:0 |
| 45 | +msgid "onchange_date_to(fiscalyear_id, period_to, date_to, until_date)" |
| 46 | +msgstr "onchange_date_to(fiscalyear_id, period_to, date_to, until_date)" |
| 47 | + |
| 48 | +#. module: account_financial_report_webkit |
| 49 | #: field:account.common.balance.report,account_ids:0 |
| 50 | #: field:general.ledger.webkit,account_ids:0 |
| 51 | #: field:partner.balance.webkit,account_ids:0 |
| 52 | @@ -24,7 +29,7 @@ |
| 53 | msgstr "Filtre par compte" |
| 54 | |
| 55 | #. module: account_financial_report_webkit |
| 56 | -#: code:addons/account_financial_report_webkit/report/common_reports.py:424 |
| 57 | +#: code:addons/account_financial_report_webkit/report/common_reports.py:432 |
| 58 | #, python-format |
| 59 | msgid "Please set a valid time filter" |
| 60 | msgstr "Veuillez selectionner un filtre de temps valide" |
| 61 | @@ -37,9 +42,8 @@ |
| 62 | msgstr "Options de format" |
| 63 | |
| 64 | #. module: account_financial_report_webkit |
| 65 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:203 |
| 66 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:223 |
| 67 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:253 |
| 68 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:209 |
| 69 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:258 |
| 70 | msgid "Cumulated Balance on Account" |
| 71 | msgstr "Solde cumulé" |
| 72 | |
| 73 | @@ -49,8 +53,8 @@ |
| 74 | msgstr "Centralisation activée" |
| 75 | |
| 76 | #. module: account_financial_report_webkit |
| 77 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:154 |
| 78 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:161 |
| 79 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:160 |
| 80 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:167 |
| 81 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:120 |
| 82 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:127 |
| 83 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:135 |
| 84 | @@ -59,40 +63,43 @@ |
| 85 | msgstr "Solde %s" |
| 86 | |
| 87 | #. module: account_financial_report_webkit |
| 88 | -#: view:account.move.line:0 |
| 89 | -msgid "Misc." |
| 90 | -msgstr "Divers" |
| 91 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:32 |
| 92 | +msgid "Journal Filter" |
| 93 | +msgstr "Journal Filter" |
| 94 | |
| 95 | #. module: account_financial_report_webkit |
| 96 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:92 |
| 97 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:95 |
| 98 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:102 |
| 99 | msgid "Periods Filter:" |
| 100 | msgstr "Filtre par période:" |
| 101 | |
| 102 | #. module: account_financial_report_webkit |
| 103 | -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:172 |
| 104 | +#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:180 |
| 105 | #, python-format |
| 106 | msgid "No header defined for this Webkit report!" |
| 107 | msgstr "Pas d'en-tête défini pour ce rapport Webkit!" |
| 108 | |
| 109 | #. module: account_financial_report_webkit |
| 110 | -#: code:addons/account_financial_report_webkit/report/open_invoices.py:162 |
| 111 | +#: code:addons/account_financial_report_webkit/report/open_invoices.py:189 |
| 112 | #, python-format |
| 113 | msgid "Filter has to be in filter date, period, or none" |
| 114 | msgstr "Filtre par date, periode au aucun uniquement" |
| 115 | |
| 116 | #. module: account_financial_report_webkit |
| 117 | -#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_trial_balance_menu_webkit |
| 118 | #: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_trial_balance_webkit |
| 119 | msgid "Trial Balance Webkit" |
| 120 | msgstr "Balance des comptes" |
| 121 | |
| 122 | #. module: account_financial_report_webkit |
| 123 | -#: constraint:account.account:0 |
| 124 | -msgid "Configuration Error! \n" |
| 125 | -"You cannot define children to an account with internal type different of \"View\"! " |
| 126 | -msgstr "Erreur de paramétrage! \n" |
| 127 | -"Vous ne pouvez pas définir de sous-compte sur un compte non \"Vue\"! " |
| 128 | +#: field:account.common.balance.report,company_id:0 |
| 129 | +#: field:general.ledger.webkit,company_id:0 |
| 130 | +#: field:open.invoices.webkit,company_id:0 |
| 131 | +#: field:partner.balance.webkit,company_id:0 |
| 132 | +#: field:partners.ledger.webkit,company_id:0 |
| 133 | +#: field:print.journal.webkit,company_id:0 |
| 134 | +#: field:trial.balance.webkit,company_id:0 |
| 135 | +msgid "Company" |
| 136 | +msgstr "Company" |
| 137 | |
| 138 | #. module: account_financial_report_webkit |
| 139 | #: view:partner.balance.webkit:0 |
| 140 | @@ -100,17 +107,23 @@ |
| 141 | msgstr "Ce rapport montre les soldes ouverts par client ou fourniseurs." |
| 142 | |
| 143 | #. module: account_financial_report_webkit |
| 144 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:138 |
| 145 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:142 |
| 146 | msgid "Account / Partner Name" |
| 147 | msgstr "Compte / Partenaire" |
| 148 | |
| 149 | #. module: account_financial_report_webkit |
| 150 | #: field:account.common.balance.report,journal_ids:0 |
| 151 | +#: code:addons/account_financial_report_webkit/report/print_journal.py:48 |
| 152 | #: field:general.ledger.webkit,journal_ids:0 |
| 153 | +#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_print_journal_menu_webkit |
| 154 | +#: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_print_journal_webkit |
| 155 | #: field:open.invoices.webkit,journal_ids:0 |
| 156 | #: field:partner.balance.webkit,journal_ids:0 |
| 157 | #: field:partners.ledger.webkit,journal_ids:0 |
| 158 | +#: view:print.journal.webkit:0 |
| 159 | +#: field:print.journal.webkit,journal_ids:0 |
| 160 | #: field:trial.balance.webkit,journal_ids:0 |
| 161 | +#, python-format |
| 162 | msgid "Journals" |
| 163 | msgstr "Journaux" |
| 164 | |
| 165 | @@ -118,19 +131,22 @@ |
| 166 | #: help:general.ledger.webkit,amount_currency:0 |
| 167 | #: help:open.invoices.webkit,amount_currency:0 |
| 168 | #: help:partners.ledger.webkit,amount_currency:0 |
| 169 | +#: help:print.journal.webkit,amount_currency:0 |
| 170 | msgid "It adds the currency column" |
| 171 | msgstr "Ajoute la colonne devise" |
| 172 | |
| 173 | #. module: account_financial_report_webkit |
| 174 | +#: code:addons/account_financial_report_webkit/report/common_reports.py:78 |
| 175 | #: selection:open.invoices.webkit,result_selection:0 |
| 176 | #: selection:partner.balance.webkit,result_selection:0 |
| 177 | #: selection:partners.ledger.webkit,result_selection:0 |
| 178 | -#: code:addons/account_financial_report_webkit/report/common_reports.py:73 |
| 179 | #, python-format |
| 180 | msgid "Receivable and Payable Accounts" |
| 181 | msgstr "Comptes clients et fournisseurs" |
| 182 | |
| 183 | #. module: account_financial_report_webkit |
| 184 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:99 |
| 185 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:82 |
| 186 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:104 |
| 187 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:119 |
| 188 | #: model:ir.model,name:account_financial_report_webkit.model_account_account |
| 189 | @@ -138,15 +154,15 @@ |
| 190 | msgstr "Comptes" |
| 191 | |
| 192 | #. module: account_financial_report_webkit |
| 193 | -#: code:addons/account_financial_report_webkit/report/trial_balance.py:42 |
| 194 | +#: code:addons/account_financial_report_webkit/report/trial_balance.py:44 |
| 195 | #, python-format |
| 196 | msgid "TRIAL BALANCE" |
| 197 | msgstr "BALANCE DES COMPTES" |
| 198 | |
| 199 | #. module: account_financial_report_webkit |
| 200 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:118 |
| 201 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:84 |
| 202 | msgid "Due Date" |
| 203 | -msgstr "Echéance" |
| 204 | +msgstr "Due Date" |
| 205 | |
| 206 | #. module: account_financial_report_webkit |
| 207 | #: view:general.ledger.webkit:0 |
| 208 | @@ -158,112 +174,89 @@ |
| 209 | msgstr "Filter sur:" |
| 210 | |
| 211 | #. module: account_financial_report_webkit |
| 212 | -#: constraint:account.move.line:0 |
| 213 | -msgid "You can not create move line on closed account." |
| 214 | -msgstr "Impossible de créer une ligne d'écriture sur un compte clôturé." |
| 215 | - |
| 216 | -#. module: account_financial_report_webkit |
| 217 | -#: model:ir.model,name:account_financial_report_webkit.model_account_report_partner_balance_webkit |
| 218 | +#: model:ir.model,name:account_financial_report_webkit.model_partner_balance_webkit |
| 219 | msgid "Partner Balance Report" |
| 220 | -msgstr "Balance des tiers" |
| 221 | +msgstr "Partner Balance Report" |
| 222 | |
| 223 | #. module: account_financial_report_webkit |
| 224 | -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:221 |
| 225 | +#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:204 |
| 226 | +#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:215 |
| 227 | #: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:230 |
| 228 | -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:247 |
| 229 | -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:258 |
| 230 | #, python-format |
| 231 | msgid "Webkit render" |
| 232 | msgstr "Rendu Webkit" |
| 233 | |
| 234 | #. module: account_financial_report_webkit |
| 235 | -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:167 |
| 236 | +#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:175 |
| 237 | #, python-format |
| 238 | msgid "Error!" |
| 239 | msgstr "Erreur!" |
| 240 | |
| 241 | #. module: account_financial_report_webkit |
| 242 | -#: model:ir.model,name:account_financial_report_webkit.model_account_report_trial_balance_webkit |
| 243 | +#: model:ir.model,name:account_financial_report_webkit.model_trial_balance_webkit |
| 244 | msgid "Trial Balance Report" |
| 245 | -msgstr "Balance des comptes" |
| 246 | - |
| 247 | -#. module: account_financial_report_webkit |
| 248 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:117 |
| 249 | -msgid "Code" |
| 250 | -msgstr "Code" |
| 251 | - |
| 252 | -#. module: account_financial_report_webkit |
| 253 | +msgstr "Balance générale" |
| 254 | + |
| 255 | +#. module: account_financial_report_webkit |
| 256 | +#: code:addons/account_financial_report_webkit/report/partners_ledger.py:48 |
| 257 | #: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_partners_ledger_menu_webkit |
| 258 | +#: view:partners.ledger.webkit:0 |
| 259 | +#, python-format |
| 260 | +msgid "Partner Ledger" |
| 261 | +msgstr "Livre des tiers" |
| 262 | + |
| 263 | +#. module: account_financial_report_webkit |
| 264 | #: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_partners_ledger_webkit |
| 265 | msgid "Partner Ledger Webkit" |
| 266 | msgstr "Livre des tiers" |
| 267 | |
| 268 | #. module: account_financial_report_webkit |
| 269 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:192 |
| 270 | +#: field:account.common.balance.report,display_account:0 |
| 271 | +#: field:partner.balance.webkit,display_account:0 |
| 272 | +#: field:print.journal.webkit,display_account:0 |
| 273 | +#: field:trial.balance.webkit,display_account:0 |
| 274 | +msgid "Display Accounts" |
| 275 | +msgstr "Display Accounts" |
| 276 | + |
| 277 | +#. module: account_financial_report_webkit |
| 278 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:206 |
| 279 | msgid "Unallocated" |
| 280 | msgstr "Non-alloué" |
| 281 | |
| 282 | #. module: account_financial_report_webkit |
| 283 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:116 |
| 284 | +#: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_general_ledger_webkit |
| 285 | +msgid "General Ledger Webkit" |
| 286 | +msgstr "Grand Livre des comptes" |
| 287 | + |
| 288 | +#. module: account_financial_report_webkit |
| 289 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:112 |
| 290 | msgid "Rec." |
| 291 | msgstr "Let." |
| 292 | |
| 293 | #. module: account_financial_report_webkit |
| 294 | -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:123 |
| 295 | -#, python-format |
| 296 | -msgid "Webkit raise an error" |
| 297 | -msgstr "Erreur Webkit" |
| 298 | - |
| 299 | -#. module: account_financial_report_webkit |
| 300 | +#: code:addons/account_financial_report_webkit/report/common_reports.py:74 |
| 301 | #: selection:open.invoices.webkit,result_selection:0 |
| 302 | #: selection:partner.balance.webkit,result_selection:0 |
| 303 | #: selection:partners.ledger.webkit,result_selection:0 |
| 304 | -#: code:addons/account_financial_report_webkit/report/common_reports.py:69 |
| 305 | #, python-format |
| 306 | msgid "Receivable Accounts" |
| 307 | msgstr "Comptes clients" |
| 308 | |
| 309 | #. module: account_financial_report_webkit |
| 310 | -#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_general_ledger_menu_webkit |
| 311 | -#: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_general_ledger_webkit |
| 312 | -msgid "General Ledger Webkit" |
| 313 | -msgstr "Grand Livre des comptes" |
| 314 | - |
| 315 | -#. module: account_financial_report_webkit |
| 316 | -#: field:account.common.balance.report,period_from:0 |
| 317 | -#: field:general.ledger.webkit,period_from:0 |
| 318 | -#: field:open.invoices.webkit,period_from:0 |
| 319 | -#: field:partner.balance.webkit,period_from:0 |
| 320 | -#: field:partners.ledger.webkit,period_from:0 |
| 321 | -#: field:trial.balance.webkit,period_from:0 |
| 322 | -msgid "Start period" |
| 323 | -msgstr "Période Début" |
| 324 | - |
| 325 | -#. module: account_financial_report_webkit |
| 326 | -#: model:ir.model,name:account_financial_report_webkit.model_account_report_open_transactions_webkit |
| 327 | -msgid "Open Transactions Report" |
| 328 | -msgstr "Liste des factures ouvertes" |
| 329 | - |
| 330 | -#. module: account_financial_report_webkit |
| 331 | -#: constraint:account.account:0 |
| 332 | -msgid "Error ! You can not create recursive accounts." |
| 333 | -msgstr "Erreur ! Vous ne pouvez pas créer de comptes récursifs." |
| 334 | - |
| 335 | -#. module: account_financial_report_webkit |
| 336 | #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:33 |
| 337 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:37 |
| 338 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:46 |
| 339 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:39 |
| 340 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:49 |
| 341 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:34 |
| 342 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:29 |
| 343 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:58 |
| 344 | msgid "Periods Filter" |
| 345 | msgstr "Filtre par période" |
| 346 | |
| 347 | #. module: account_financial_report_webkit |
| 348 | #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:38 |
| 349 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:139 |
| 350 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:52 |
| 351 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:142 |
| 352 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:143 |
| 353 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:55 |
| 354 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:148 |
| 355 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:39 |
| 356 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:153 |
| 357 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:50 |
| 358 | @@ -274,19 +267,9 @@ |
| 359 | msgstr "Solde à nouveau" |
| 360 | |
| 361 | #. module: account_financial_report_webkit |
| 362 | -#: field:account.common.balance.report,period_to:0 |
| 363 | -#: field:general.ledger.webkit,period_to:0 |
| 364 | -#: field:open.invoices.webkit,period_to:0 |
| 365 | -#: field:partner.balance.webkit,period_to:0 |
| 366 | -#: field:partners.ledger.webkit,period_to:0 |
| 367 | -#: field:trial.balance.webkit,period_to:0 |
| 368 | -msgid "End period" |
| 369 | -msgstr "Période Fin" |
| 370 | - |
| 371 | -#. module: account_financial_report_webkit |
| 372 | -#: model:ir.model,name:account_financial_report_webkit.model_account_report_general_ledger_webkit |
| 373 | +#: model:ir.model,name:account_financial_report_webkit.model_general_ledger_webkit |
| 374 | msgid "General Ledger Report" |
| 375 | -msgstr "Grand livre des comptes" |
| 376 | +msgstr "Grand livre" |
| 377 | |
| 378 | #. module: account_financial_report_webkit |
| 379 | #: constraint:open.invoices.webkit:0 |
| 380 | @@ -294,14 +277,20 @@ |
| 381 | msgstr "La date d'apurement doit être postérieure à la date de fin sélectionnée." |
| 382 | |
| 383 | #. module: account_financial_report_webkit |
| 384 | +#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:132 |
| 385 | +#, python-format |
| 386 | +msgid "Webkit error" |
| 387 | +msgstr "Webkit error" |
| 388 | + |
| 389 | +#. module: account_financial_report_webkit |
| 390 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:48 |
| 391 | msgid "Displayed Accounts" |
| 392 | msgstr "Comptes filtrés" |
| 393 | |
| 394 | #. module: account_financial_report_webkit |
| 395 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:99 |
| 396 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:112 |
| 397 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:101 |
| 398 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:108 |
| 399 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:86 |
| 400 | msgid "Partner" |
| 401 | msgstr "Partenaire" |
| 402 | |
| 403 | @@ -311,6 +300,7 @@ |
| 404 | #: help:open.invoices.webkit,chart_account_id:0 |
| 405 | #: help:partner.balance.webkit,chart_account_id:0 |
| 406 | #: help:partners.ledger.webkit,chart_account_id:0 |
| 407 | +#: help:print.journal.webkit,chart_account_id:0 |
| 408 | #: help:trial.balance.webkit,chart_account_id:0 |
| 409 | msgid "Select Charts of Accounts" |
| 410 | msgstr "Selection du Plan comptable" |
| 411 | @@ -321,28 +311,22 @@ |
| 412 | #: field:open.invoices.webkit,filter:0 |
| 413 | #: field:partner.balance.webkit,filter:0 |
| 414 | #: field:partners.ledger.webkit,filter:0 |
| 415 | +#: field:print.journal.webkit,filter:0 |
| 416 | #: field:trial.balance.webkit,filter:0 |
| 417 | msgid "Filter by" |
| 418 | msgstr "Filtrer par" |
| 419 | |
| 420 | #. module: account_financial_report_webkit |
| 421 | -#: view:partners.ledger.webkit:0 |
| 422 | -#: code:addons/account_financial_report_webkit/report/partners_ledger.py:48 |
| 423 | -#, python-format |
| 424 | -msgid "Partner Ledger" |
| 425 | -msgstr "Livre des tiers" |
| 426 | - |
| 427 | -#. module: account_financial_report_webkit |
| 428 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:114 |
| 429 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:129 |
| 430 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:116 |
| 431 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:123 |
| 432 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:97 |
| 433 | msgid "Curr." |
| 434 | msgstr "Dev." |
| 435 | |
| 436 | #. module: account_financial_report_webkit |
| 437 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:101 |
| 438 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:114 |
| 439 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:103 |
| 440 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:110 |
| 441 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:88 |
| 442 | msgid "Label" |
| 443 | msgstr "Description" |
| 444 | |
| 445 | @@ -355,17 +339,17 @@ |
| 446 | msgstr "Seuls les comptes selectionnés seront imprimés. Laisser vide pour les imprimer tous." |
| 447 | |
| 448 | #. module: account_financial_report_webkit |
| 449 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:105 |
| 450 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:120 |
| 451 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:145 |
| 452 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:107 |
| 453 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:151 |
| 454 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:114 |
| 455 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:90 |
| 456 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:111 |
| 457 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:126 |
| 458 | msgid "Debit" |
| 459 | msgstr "Débit" |
| 460 | |
| 461 | #. module: account_financial_report_webkit |
| 462 | -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:173 |
| 463 | +#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:181 |
| 464 | #, python-format |
| 465 | msgid "Please set a header in company settings" |
| 466 | msgstr "Veuillez paramétrer un en-tête dans la société" |
| 467 | @@ -380,13 +364,20 @@ |
| 468 | msgstr "Filtre de temps" |
| 469 | |
| 470 | #. module: account_financial_report_webkit |
| 471 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:188 |
| 472 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:219 |
| 473 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:224 |
| 474 | msgid "Cumulated Balance on Partner" |
| 475 | msgstr "Totaux" |
| 476 | |
| 477 | #. module: account_financial_report_webkit |
| 478 | -#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_partner_balance_menu_webkit |
| 479 | +#: help:account.common.balance.report,filter:0 |
| 480 | +#: help:open.invoices.webkit,filter:0 |
| 481 | +#: help:partner.balance.webkit,filter:0 |
| 482 | +#: help:partners.ledger.webkit,filter:0 |
| 483 | +#: help:trial.balance.webkit,filter:0 |
| 484 | +msgid "Filter by date: no opening balance will be displayed. (opening balance can only be computed based on period to be correct)." |
| 485 | +msgstr "Filter by date: no opening balance will be displayed. (opening balance can only be computed based on period to be correct)." |
| 486 | + |
| 487 | +#. module: account_financial_report_webkit |
| 488 | #: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_partner_balance_webkit |
| 489 | msgid "Partner Balance Webkit" |
| 490 | msgstr "Balance des tiers" |
| 491 | @@ -407,18 +398,11 @@ |
| 492 | "" |
| 493 | |
| 494 | #. module: account_financial_report_webkit |
| 495 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:40 |
| 496 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:42 |
| 497 | msgid "Clearance Date" |
| 498 | msgstr "Date d'apurement" |
| 499 | |
| 500 | #. module: account_financial_report_webkit |
| 501 | -#: selection:general.ledger.webkit,display_account:0 |
| 502 | -#: code:addons/account_financial_report_webkit/report/common_reports.py:62 |
| 503 | -#, python-format |
| 504 | -msgid "With transactions or non zero balance" |
| 505 | -msgstr "Compte mouvementé ou dont le solde n'est pas nul" |
| 506 | - |
| 507 | -#. module: account_financial_report_webkit |
| 508 | #: view:partners.ledger.webkit:0 |
| 509 | msgid "This report allows you to print or generate a pdf of your partner ledger with details of all your payable/receivable account" |
| 510 | msgstr "Cet état imprime tout les mouvements comptables par partenaire (client / fournisseur)" |
| 511 | @@ -426,12 +410,22 @@ |
| 512 | #. module: account_financial_report_webkit |
| 513 | #: selection:account.common.balance.report,display_account:0 |
| 514 | #: selection:partner.balance.webkit,display_account:0 |
| 515 | +#: selection:print.journal.webkit,display_account:0 |
| 516 | #: selection:trial.balance.webkit,display_account:0 |
| 517 | msgid "With balance is not equal to 0" |
| 518 | msgstr "Compte dont le solde n'est pas 0" |
| 519 | |
| 520 | #. module: account_financial_report_webkit |
| 521 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:94 |
| 522 | +#: view:general.ledger.webkit:0 |
| 523 | +#: view:open.invoices.webkit:0 |
| 524 | +#: view:partner.balance.webkit:0 |
| 525 | +#: view:partners.ledger.webkit:0 |
| 526 | +#: view:trial.balance.webkit:0 |
| 527 | +msgid "[('fiscalyear_id', '=', fiscalyear_id), ('special', '=', False)]" |
| 528 | +msgstr "[('fiscalyear_id', '=', fiscalyear_id), ('special', '=', False)]" |
| 529 | + |
| 530 | +#. module: account_financial_report_webkit |
| 531 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:97 |
| 532 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:104 |
| 533 | msgid "Fiscal Year :" |
| 534 | msgstr "Excercice comptable :" |
| 535 | @@ -442,26 +436,36 @@ |
| 536 | msgstr "Cet état vous permet d'éditer la listes de factures ouvertes à la date de votre choix" |
| 537 | |
| 538 | #. module: account_financial_report_webkit |
| 539 | -#: code:addons/account_financial_report_webkit/report/common_reports.py:416 |
| 540 | +#: code:addons/account_financial_report_webkit/report/common_reports.py:424 |
| 541 | #, python-format |
| 542 | msgid "Must be in include_opening, exclude_opening" |
| 543 | msgstr "Doit être dans include_opening, exclude_opening" |
| 544 | |
| 545 | #. module: account_financial_report_webkit |
| 546 | +#: view:general.ledger.webkit:0 |
| 547 | +#: view:open.invoices.webkit:0 |
| 548 | +#: view:partner.balance.webkit:0 |
| 549 | +#: view:partners.ledger.webkit:0 |
| 550 | +#: view:trial.balance.webkit:0 |
| 551 | +msgid "True" |
| 552 | +msgstr "True" |
| 553 | + |
| 554 | +#. module: account_financial_report_webkit |
| 555 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:43 |
| 556 | -#: code:addons/account_financial_report_webkit/wizard/balance_common.py:163 |
| 557 | +#: code:addons/account_financial_report_webkit/wizard/balance_common.py:176 |
| 558 | #, python-format |
| 559 | msgid "Dates" |
| 560 | msgstr "Dates" |
| 561 | |
| 562 | #. module: account_financial_report_webkit |
| 563 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:136 |
| 564 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:144 |
| 565 | msgid "Code / Ref" |
| 566 | msgstr "Compte / Réf." |
| 567 | |
| 568 | #. module: account_financial_report_webkit |
| 569 | +#: code:addons/account_financial_report_webkit/report/trial_balance.py:51 |
| 570 | +#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_trial_balance_menu_webkit |
| 571 | #: view:trial.balance.webkit:0 |
| 572 | -#: code:addons/account_financial_report_webkit/report/trial_balance.py:49 |
| 573 | #, python-format |
| 574 | msgid "Trial Balance" |
| 575 | msgstr "Balance des comptes" |
| 576 | @@ -472,37 +476,68 @@ |
| 577 | msgstr "Dates : " |
| 578 | |
| 579 | #. module: account_financial_report_webkit |
| 580 | +#: field:account.common.balance.report,comp0_period_to:0 |
| 581 | +#: field:account.common.balance.report,comp1_period_to:0 |
| 582 | +#: field:account.common.balance.report,comp2_period_to:0 |
| 583 | +#: field:account.common.balance.report,period_to:0 |
| 584 | +#: field:general.ledger.webkit,period_to:0 |
| 585 | +#: field:open.invoices.webkit,period_to:0 |
| 586 | +#: field:partner.balance.webkit,comp0_period_to:0 |
| 587 | +#: field:partner.balance.webkit,comp1_period_to:0 |
| 588 | +#: field:partner.balance.webkit,comp2_period_to:0 |
| 589 | +#: field:partner.balance.webkit,period_to:0 |
| 590 | +#: field:partners.ledger.webkit,period_to:0 |
| 591 | +#: field:print.journal.webkit,period_to:0 |
| 592 | +#: field:trial.balance.webkit,comp0_period_to:0 |
| 593 | +#: field:trial.balance.webkit,comp1_period_to:0 |
| 594 | +#: field:trial.balance.webkit,comp2_period_to:0 |
| 595 | +#: field:trial.balance.webkit,period_to:0 |
| 596 | +msgid "End Period" |
| 597 | +msgstr "End Period" |
| 598 | + |
| 599 | +#. module: account_financial_report_webkit |
| 600 | #: model:ir.model,name:account_financial_report_webkit.model_account_common_balance_report |
| 601 | msgid "Common Balance Report" |
| 602 | msgstr "Common Balance Report" |
| 603 | |
| 604 | #. module: account_financial_report_webkit |
| 605 | #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:36 |
| 606 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:41 |
| 607 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:49 |
| 608 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:43 |
| 609 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:52 |
| 610 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:37 |
| 611 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:61 |
| 612 | msgid "Accounts Filter" |
| 613 | msgstr "Filtre par compte" |
| 614 | |
| 615 | #. module: account_financial_report_webkit |
| 616 | -#: field:account.common.balance.report,chart_account_id:0 |
| 617 | -#: field:general.ledger.webkit,chart_account_id:0 |
| 618 | -#: field:open.invoices.webkit,chart_account_id:0 |
| 619 | -#: field:partner.balance.webkit,chart_account_id:0 |
| 620 | -#: field:partners.ledger.webkit,chart_account_id:0 |
| 621 | -#: field:trial.balance.webkit,chart_account_id:0 |
| 622 | -msgid "Chart of account" |
| 623 | -msgstr "Plan comptable" |
| 624 | +#: selection:account.common.balance.report,comp0_filter:0 |
| 625 | +#: selection:account.common.balance.report,comp1_filter:0 |
| 626 | +#: selection:account.common.balance.report,comp2_filter:0 |
| 627 | +#: selection:account.common.balance.report,filter:0 |
| 628 | +#: selection:partner.balance.webkit,comp0_filter:0 |
| 629 | +#: selection:partner.balance.webkit,comp1_filter:0 |
| 630 | +#: selection:partner.balance.webkit,comp2_filter:0 |
| 631 | +#: selection:partner.balance.webkit,filter:0 |
| 632 | +#: selection:trial.balance.webkit,comp0_filter:0 |
| 633 | +#: selection:trial.balance.webkit,comp1_filter:0 |
| 634 | +#: selection:trial.balance.webkit,comp2_filter:0 |
| 635 | +#: selection:trial.balance.webkit,filter:0 |
| 636 | +msgid "Opening Only" |
| 637 | +msgstr "Balance d'ouverture" |
| 638 | |
| 639 | #. module: account_financial_report_webkit |
| 640 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:65 |
| 641 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:67 |
| 642 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:60 |
| 643 | msgid "Custom Filter" |
| 644 | msgstr "Filtre personalisé" |
| 645 | |
| 646 | #. module: account_financial_report_webkit |
| 647 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:90 |
| 648 | +#: model:ir.model,name:account_financial_report_webkit.model_print_journal_webkit |
| 649 | +msgid "Journals Report" |
| 650 | +msgstr "Journals Report" |
| 651 | + |
| 652 | +#. module: account_financial_report_webkit |
| 653 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:93 |
| 654 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:100 |
| 655 | msgid "Dates Filter:" |
| 656 | msgstr "Filtre Dates:" |
| 657 | @@ -515,50 +550,55 @@ |
| 658 | #. module: account_financial_report_webkit |
| 659 | #: selection:account.common.balance.report,display_account:0 |
| 660 | #: selection:partner.balance.webkit,display_account:0 |
| 661 | +#: selection:print.journal.webkit,display_account:0 |
| 662 | #: selection:trial.balance.webkit,display_account:0 |
| 663 | msgid "With movements" |
| 664 | msgstr "Mouvementé" |
| 665 | |
| 666 | #. module: account_financial_report_webkit |
| 667 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:109 |
| 668 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:124 |
| 669 | +#: view:open.invoices.webkit:0 |
| 670 | +msgid "onchange_period_to(fiscalyear_id, period_to, date_to, until_date)" |
| 671 | +msgstr "onchange_period_to(fiscalyear_id, period_to, date_to, until_date)" |
| 672 | + |
| 673 | +#. module: account_financial_report_webkit |
| 674 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:111 |
| 675 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:118 |
| 676 | msgid "Cumul. Bal." |
| 677 | msgstr "Solde Cumul." |
| 678 | |
| 679 | #. module: account_financial_report_webkit |
| 680 | #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:22 |
| 681 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:35 |
| 682 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:38 |
| 683 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:23 |
| 684 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:47 |
| 685 | msgid "Computed" |
| 686 | msgstr "Calculé" |
| 687 | |
| 688 | #. module: account_financial_report_webkit |
| 689 | -#: code:addons/account_financial_report_webkit/report/general_ledger.py:64 |
| 690 | -#: code:addons/account_financial_report_webkit/report/open_invoices.py:63 |
| 691 | +#: code:addons/account_financial_report_webkit/report/general_ledger.py:65 |
| 692 | +#: code:addons/account_financial_report_webkit/report/open_invoices.py:76 |
| 693 | #: code:addons/account_financial_report_webkit/report/partner_balance.py:63 |
| 694 | #: code:addons/account_financial_report_webkit/report/partners_ledger.py:64 |
| 695 | -#: code:addons/account_financial_report_webkit/report/profit_loss.py:71 |
| 696 | -#: code:addons/account_financial_report_webkit/report/trial_balance.py:64 |
| 697 | -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:67 |
| 698 | +#: code:addons/account_financial_report_webkit/report/print_journal.py:65 |
| 699 | +#: code:addons/account_financial_report_webkit/report/trial_balance.py:66 |
| 700 | #, python-format |
| 701 | msgid "of" |
| 702 | msgstr "de" |
| 703 | |
| 704 | #. module: account_financial_report_webkit |
| 705 | +#: code:addons/account_financial_report_webkit/report/common_reports.py:76 |
| 706 | #: selection:open.invoices.webkit,result_selection:0 |
| 707 | #: selection:partner.balance.webkit,result_selection:0 |
| 708 | #: selection:partners.ledger.webkit,result_selection:0 |
| 709 | -#: code:addons/account_financial_report_webkit/report/common_reports.py:71 |
| 710 | #, python-format |
| 711 | msgid "Payable Accounts" |
| 712 | msgstr "Comptes fournisseur" |
| 713 | |
| 714 | #. module: account_financial_report_webkit |
| 715 | -#: code:addons/account_financial_report_webkit/report/open_invoices.py:48 |
| 716 | +#: code:addons/account_financial_report_webkit/report/open_invoices.py:61 |
| 717 | +#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_open_invoices_menu_webkit |
| 718 | #: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_open_invoices_webkit |
| 719 | -#: model:ir.model,name:account_financial_report_webkit.model_account_report_open_invoices_webkit |
| 720 | +#: model:ir.model,name:account_financial_report_webkit.model_open_invoices_webkit |
| 721 | #, python-format |
| 722 | msgid "Open Invoices Report" |
| 723 | msgstr "Etat des factures ouvertes" |
| 724 | @@ -569,47 +609,62 @@ |
| 725 | msgstr "Centralisé" |
| 726 | |
| 727 | #. module: account_financial_report_webkit |
| 728 | -#: field:account.common.balance.report,display_account:0 |
| 729 | #: field:general.ledger.webkit,display_account:0 |
| 730 | -#: field:partner.balance.webkit,display_account:0 |
| 731 | -#: field:trial.balance.webkit,display_account:0 |
| 732 | msgid "Display accounts" |
| 733 | msgstr "Comptes affichés" |
| 734 | |
| 735 | #. module: account_financial_report_webkit |
| 736 | -#: view:account.move.line:0 |
| 737 | -msgid "Narration" |
| 738 | -msgstr "Historique" |
| 739 | +#: code:addons/account_financial_report_webkit/report/partner_balance.py:40 |
| 740 | +#, python-format |
| 741 | +msgid "PARTNER BALANCE" |
| 742 | +msgstr "BALANCE DES TIERS" |
| 743 | |
| 744 | #. module: account_financial_report_webkit |
| 745 | +#: field:account.common.balance.report,comp0_date_from:0 |
| 746 | +#: field:account.common.balance.report,comp1_date_from:0 |
| 747 | +#: field:account.common.balance.report,comp2_date_from:0 |
| 748 | #: field:account.common.balance.report,date_from:0 |
| 749 | #: field:general.ledger.webkit,date_from:0 |
| 750 | #: field:open.invoices.webkit,date_from:0 |
| 751 | +#: field:partner.balance.webkit,comp0_date_from:0 |
| 752 | +#: field:partner.balance.webkit,comp1_date_from:0 |
| 753 | +#: field:partner.balance.webkit,comp2_date_from:0 |
| 754 | #: field:partner.balance.webkit,date_from:0 |
| 755 | #: field:partners.ledger.webkit,date_from:0 |
| 756 | +#: field:print.journal.webkit,date_from:0 |
| 757 | +#: field:trial.balance.webkit,comp0_date_from:0 |
| 758 | +#: field:trial.balance.webkit,comp1_date_from:0 |
| 759 | +#: field:trial.balance.webkit,comp2_date_from:0 |
| 760 | #: field:trial.balance.webkit,date_from:0 |
| 761 | msgid "Start Date" |
| 762 | msgstr "Date Début" |
| 763 | |
| 764 | #. module: account_financial_report_webkit |
| 765 | #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:22 |
| 766 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:35 |
| 767 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:38 |
| 768 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:23 |
| 769 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:47 |
| 770 | msgid "Opening Entries" |
| 771 | msgstr "Basé sur l'écriture d'ouverture" |
| 772 | |
| 773 | #. module: account_financial_report_webkit |
| 774 | -#: code:addons/account_financial_report_webkit/report/general_ledger.py:40 |
| 775 | +#: code:addons/account_financial_report_webkit/report/general_ledger.py:41 |
| 776 | #, python-format |
| 777 | msgid "GENERAL LEDGER" |
| 778 | msgstr "GRAND LIVRE DES COMPTES" |
| 779 | |
| 780 | #. module: account_financial_report_webkit |
| 781 | -#: code:addons/account_financial_report_webkit/wizard/profit_loss_wizard.py:131 |
| 782 | +#: selection:account.common.balance.report,target_move:0 |
| 783 | +#: code:addons/account_financial_report_webkit/report/common_reports.py:87 |
| 784 | +#: selection:general.ledger.webkit,target_move:0 |
| 785 | +#: selection:open.invoices.webkit,target_move:0 |
| 786 | +#: selection:partner.balance.webkit,target_move:0 |
| 787 | +#: selection:partners.ledger.webkit,target_move:0 |
| 788 | +#: selection:print.journal.webkit,target_move:0 |
| 789 | +#: selection:trial.balance.webkit,target_move:0 |
| 790 | #, python-format |
| 791 | -msgid "Level %s" |
| 792 | -msgstr "Niveau %s" |
| 793 | +msgid "All Entries" |
| 794 | +msgstr "Ecritures validées + brouillon" |
| 795 | |
| 796 | #. module: account_financial_report_webkit |
| 797 | #: help:account.account,centralized:0 |
| 798 | @@ -617,8 +672,13 @@ |
| 799 | msgstr "Si coché, les mouvements de ce compte seront groupés par période." |
| 800 | |
| 801 | #. module: account_financial_report_webkit |
| 802 | +#: field:open.invoices.webkit,group_by_currency:0 |
| 803 | +msgid "Group Partner by currency" |
| 804 | +msgstr "Group Partner by currency" |
| 805 | + |
| 806 | +#. module: account_financial_report_webkit |
| 807 | #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:22 |
| 808 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:35 |
| 809 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:38 |
| 810 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:23 |
| 811 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:77 |
| 812 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:94 |
| 813 | @@ -627,20 +687,33 @@ |
| 814 | msgstr "Non" |
| 815 | |
| 816 | #. module: account_financial_report_webkit |
| 817 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:97 |
| 818 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:100 |
| 819 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:94 |
| 820 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:107 |
| 821 | msgid "Initial Balance:" |
| 822 | msgstr "Solde à nouveau:" |
| 823 | |
| 824 | #. module: account_financial_report_webkit |
| 825 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:163 |
| 826 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:169 |
| 827 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:129 |
| 828 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:144 |
| 829 | msgid "Balance C%s" |
| 830 | msgstr "Solde C%s" |
| 831 | |
| 832 | #. module: account_financial_report_webkit |
| 833 | +#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:133 |
| 834 | +#, python-format |
| 835 | +msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s" |
| 836 | +msgstr "The command 'wkhtmltopdf' failed with error code = %s. Message: %s" |
| 837 | + |
| 838 | +#. module: account_financial_report_webkit |
| 839 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:95 |
| 840 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:104 |
| 841 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:80 |
| 842 | +msgid "Entry" |
| 843 | +msgstr "Ecriture" |
| 844 | + |
| 845 | +#. module: account_financial_report_webkit |
| 846 | #: field:account.move.line,last_rec_date:0 |
| 847 | msgid "Last reconciliation date" |
| 848 | msgstr "Last reconciliation date" |
| 849 | @@ -653,8 +726,9 @@ |
| 850 | msgstr "Filtre sur partenaire" |
| 851 | |
| 852 | #. module: account_financial_report_webkit |
| 853 | +#: code:addons/account_financial_report_webkit/report/general_ledger.py:48 |
| 854 | #: view:general.ledger.webkit:0 |
| 855 | -#: code:addons/account_financial_report_webkit/report/general_ledger.py:47 |
| 856 | +#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_general_ledger_menu_webkit |
| 857 | #, python-format |
| 858 | msgid "General Ledger" |
| 859 | msgstr "Grand livre des comptes" |
| 860 | @@ -670,10 +744,10 @@ |
| 861 | msgstr "Periodes : " |
| 862 | |
| 863 | #. module: account_financial_report_webkit |
| 864 | -#: code:addons/account_financial_report_webkit/report/partner_balance.py:40 |
| 865 | +#: code:addons/account_financial_report_webkit/report/print_journal.py:41 |
| 866 | #, python-format |
| 867 | -msgid "PARTNER BALANCE" |
| 868 | -msgstr "BALANCE DES TIERS" |
| 869 | +msgid "JOURNALS" |
| 870 | +msgstr "JOURNALS" |
| 871 | |
| 872 | #. module: account_financial_report_webkit |
| 873 | #: help:open.invoices.webkit,partner_ids:0 |
| 874 | @@ -683,21 +757,36 @@ |
| 875 | msgstr "Selectionnez les partenaires à imprimer ou laissez vide pour les imprimer tous." |
| 876 | |
| 877 | #. module: account_financial_report_webkit |
| 878 | -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:167 |
| 879 | +#: view:open.invoices.webkit:0 |
| 880 | +msgid "onchange_fiscalyear(fiscalyear_id, period_to, date_to, until_date)" |
| 881 | +msgstr "onchange_fiscalyear(fiscalyear_id, period_to, date_to, until_date)" |
| 882 | + |
| 883 | +#. module: account_financial_report_webkit |
| 884 | +#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:175 |
| 885 | #, python-format |
| 886 | msgid "Webkit Report template not found !" |
| 887 | msgstr "Webkit Report template not found !" |
| 888 | |
| 889 | #. module: account_financial_report_webkit |
| 890 | +#: selection:account.common.balance.report,comp0_filter:0 |
| 891 | +#: selection:account.common.balance.report,comp1_filter:0 |
| 892 | +#: selection:account.common.balance.report,comp2_filter:0 |
| 893 | #: selection:account.common.balance.report,filter:0 |
| 894 | -#: selection:general.ledger.webkit,filter:0 |
| 895 | -#: selection:open.invoices.webkit,filter:0 |
| 896 | -#: selection:partner.balance.webkit,filter:0 |
| 897 | -#: selection:partners.ledger.webkit,filter:0 |
| 898 | -#: selection:trial.balance.webkit,filter:0 |
| 899 | #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:91 |
| 900 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:104 |
| 901 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:100 |
| 902 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:78 |
| 903 | +#: selection:general.ledger.webkit,filter:0 |
| 904 | +#: selection:open.invoices.webkit,filter:0 |
| 905 | +#: selection:partner.balance.webkit,comp0_filter:0 |
| 906 | +#: selection:partner.balance.webkit,comp1_filter:0 |
| 907 | +#: selection:partner.balance.webkit,comp2_filter:0 |
| 908 | +#: selection:partner.balance.webkit,filter:0 |
| 909 | +#: selection:partners.ledger.webkit,filter:0 |
| 910 | +#: selection:print.journal.webkit,filter:0 |
| 911 | +#: selection:trial.balance.webkit,comp0_filter:0 |
| 912 | +#: selection:trial.balance.webkit,comp1_filter:0 |
| 913 | +#: selection:trial.balance.webkit,comp2_filter:0 |
| 914 | +#: selection:trial.balance.webkit,filter:0 |
| 915 | msgid "Date" |
| 916 | msgstr "Date" |
| 917 | |
| 918 | @@ -707,70 +796,66 @@ |
| 919 | msgstr "Décocher pour afficher ne pas activer la centralisation des comptes." |
| 920 | |
| 921 | #. module: account_financial_report_webkit |
| 922 | -#: constraint:account.move.line:0 |
| 923 | -msgid "Company must be same for its related account and period." |
| 924 | -msgstr "La société doit être la même pour les comptes et périodes liées." |
| 925 | - |
| 926 | -#. module: account_financial_report_webkit |
| 927 | #: constraint:account.common.balance.report:0 |
| 928 | #: constraint:general.ledger.webkit:0 |
| 929 | +#: constraint:open.invoices.webkit:0 |
| 930 | #: constraint:partner.balance.webkit:0 |
| 931 | #: constraint:partners.ledger.webkit:0 |
| 932 | +#: constraint:print.journal.webkit:0 |
| 933 | #: constraint:trial.balance.webkit:0 |
| 934 | msgid "When no Fiscal year is selected, you must choose to filter by periods or by date." |
| 935 | msgstr "When no Fiscal year is selected, you must choose to filter by periods or by date." |
| 936 | |
| 937 | #. module: account_financial_report_webkit |
| 938 | #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:50 |
| 939 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:55 |
| 940 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:64 |
| 941 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:57 |
| 942 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:67 |
| 943 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:51 |
| 944 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:45 |
| 945 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:62 |
| 946 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:75 |
| 947 | msgid "To:" |
| 948 | msgstr "A:" |
| 949 | |
| 950 | #. module: account_financial_report_webkit |
| 951 | -#: sql_constraint:account.account:0 |
| 952 | -msgid "The code of the account must be unique per company !" |
| 953 | -msgstr "Le code du compte doit être unique par société." |
| 954 | - |
| 955 | -#. module: account_financial_report_webkit |
| 956 | +#: model:ir.ui.menu,name:account_financial_report_webkit.menu_account_open_invoices |
| 957 | #: view:open.invoices.webkit:0 |
| 958 | -#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_open_invoices_menu_webkit |
| 959 | msgid "Open Invoices" |
| 960 | -msgstr "Factures ouvertes" |
| 961 | +msgstr "Etat des factures ouvertes" |
| 962 | |
| 963 | #. module: account_financial_report_webkit |
| 964 | #: selection:account.common.balance.report,target_move:0 |
| 965 | +#: code:addons/account_financial_report_webkit/report/common_reports.py:85 |
| 966 | #: selection:general.ledger.webkit,target_move:0 |
| 967 | #: selection:open.invoices.webkit,target_move:0 |
| 968 | #: selection:partner.balance.webkit,target_move:0 |
| 969 | #: selection:partners.ledger.webkit,target_move:0 |
| 970 | +#: selection:print.journal.webkit,target_move:0 |
| 971 | #: selection:trial.balance.webkit,target_move:0 |
| 972 | -#: code:addons/account_financial_report_webkit/report/common_reports.py:80 |
| 973 | #, python-format |
| 974 | msgid "All Posted Entries" |
| 975 | msgstr "Ecritures validées" |
| 976 | |
| 977 | #. module: account_financial_report_webkit |
| 978 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:87 |
| 979 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:90 |
| 980 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:84 |
| 981 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:97 |
| 982 | -#: code:addons/account_financial_report_webkit/wizard/balance_common.py:156 |
| 983 | +#: code:addons/account_financial_report_webkit/wizard/balance_common.py:153 |
| 984 | #, python-format |
| 985 | msgid "Comparison %s" |
| 986 | msgstr "Comparaison %s" |
| 987 | |
| 988 | #. module: account_financial_report_webkit |
| 989 | #: selection:account.common.balance.report,display_account:0 |
| 990 | -#: selection:general.ledger.webkit,display_account:0 |
| 991 | -#: selection:partner.balance.webkit,display_account:0 |
| 992 | -#: selection:trial.balance.webkit,display_account:0 |
| 993 | #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:61 |
| 994 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:75 |
| 995 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:78 |
| 996 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:56 |
| 997 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:73 |
| 998 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:86 |
| 999 | +#: selection:general.ledger.webkit,display_account:0 |
| 1000 | +#: selection:partner.balance.webkit,display_account:0 |
| 1001 | +#: selection:print.journal.webkit,display_account:0 |
| 1002 | +#: selection:trial.balance.webkit,display_account:0 |
| 1003 | msgid "All" |
| 1004 | msgstr "Tous" |
| 1005 | |
| 1006 | @@ -780,20 +865,21 @@ |
| 1007 | #: help:open.invoices.webkit,fiscalyear_id:0 |
| 1008 | #: help:partner.balance.webkit,fiscalyear_id:0 |
| 1009 | #: help:partners.ledger.webkit,fiscalyear_id:0 |
| 1010 | +#: help:print.journal.webkit,fiscalyear_id:0 |
| 1011 | #: help:trial.balance.webkit,fiscalyear_id:0 |
| 1012 | msgid "Keep empty for all open fiscal year" |
| 1013 | msgstr "Laisser vide pour selectionner tout les excercices" |
| 1014 | |
| 1015 | #. module: account_financial_report_webkit |
| 1016 | -#: help:account.move.line,last_rec_date:0 |
| 1017 | -msgid "the date of the last reconciliation (full or partial) account move line" |
| 1018 | -msgstr "Date du léttrage le plus récent (total ou partiel) c'est à dire du dernier paiement" |
| 1019 | +#: view:print.journal.webkit:0 |
| 1020 | +msgid "This report allows you to print or generate a pdf of your print journal with details of all your account journals" |
| 1021 | +msgstr "This report allows you to print or generate a pdf of your print journal with details of all your account journals" |
| 1022 | |
| 1023 | #. module: account_financial_report_webkit |
| 1024 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:107 |
| 1025 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:122 |
| 1026 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:147 |
| 1027 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:109 |
| 1028 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:153 |
| 1029 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:116 |
| 1030 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:92 |
| 1031 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:113 |
| 1032 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:128 |
| 1033 | msgid "Credit" |
| 1034 | @@ -805,60 +891,59 @@ |
| 1035 | #: selection:open.invoices.webkit,filter:0 |
| 1036 | #: selection:partner.balance.webkit,filter:0 |
| 1037 | #: selection:partners.ledger.webkit,filter:0 |
| 1038 | +#: selection:print.journal.webkit,filter:0 |
| 1039 | #: selection:trial.balance.webkit,filter:0 |
| 1040 | msgid "No Filters" |
| 1041 | msgstr "Pas de filtre" |
| 1042 | |
| 1043 | #. module: account_financial_report_webkit |
| 1044 | -#: code:addons/account_financial_report_webkit/report/open_invoices.py:102 |
| 1045 | -#: code:addons/account_financial_report_webkit/report/partners_ledger.py:102 |
| 1046 | +#: code:addons/account_financial_report_webkit/report/common_reports.py:353 |
| 1047 | +#: code:addons/account_financial_report_webkit/report/open_invoices.py:127 |
| 1048 | +#: code:addons/account_financial_report_webkit/report/partners_ledger.py:112 |
| 1049 | #, python-format |
| 1050 | msgid "Error" |
| 1051 | msgstr "Erreur" |
| 1052 | |
| 1053 | #. module: account_financial_report_webkit |
| 1054 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:152 |
| 1055 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:158 |
| 1056 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:118 |
| 1057 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:133 |
| 1058 | msgid "Balance" |
| 1059 | msgstr "Solde" |
| 1060 | |
| 1061 | #. module: account_financial_report_webkit |
| 1062 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:103 |
| 1063 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:105 |
| 1064 | msgid "Counter part" |
| 1065 | msgstr "Contrepartie" |
| 1066 | |
| 1067 | #. module: account_financial_report_webkit |
| 1068 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:168 |
| 1069 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:174 |
| 1070 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:134 |
| 1071 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:149 |
| 1072 | msgid "% Difference" |
| 1073 | msgstr "% Différence" |
| 1074 | |
| 1075 | #. module: account_financial_report_webkit |
| 1076 | -#: help:account.common.balance.report,filter:0 |
| 1077 | -#: help:open.invoices.webkit,filter:0 |
| 1078 | -#: help:partner.balance.webkit,filter:0 |
| 1079 | -#: help:partners.ledger.webkit,filter:0 |
| 1080 | -#: help:trial.balance.webkit,filter:0 |
| 1081 | -msgid "Filter by date : no opening balance will be displayed. (opening balance can only be calculated based on period to be correct)." |
| 1082 | -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)." |
| 1083 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:117 |
| 1084 | +msgid "Code" |
| 1085 | +msgstr "Code" |
| 1086 | |
| 1087 | #. module: account_financial_report_webkit |
| 1088 | -#: code:addons/account_financial_report_webkit/report/common_reports.py:313 |
| 1089 | +#: code:addons/account_financial_report_webkit/report/common_reports.py:314 |
| 1090 | #, python-format |
| 1091 | msgid "No period found" |
| 1092 | msgstr "Pas de période trouvée" |
| 1093 | |
| 1094 | #. module: account_financial_report_webkit |
| 1095 | -#: view:partner.balance.webkit:0 |
| 1096 | #: code:addons/account_financial_report_webkit/report/partner_balance.py:47 |
| 1097 | +#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_partner_balance_menu_webkit |
| 1098 | +#: view:partner.balance.webkit:0 |
| 1099 | #, python-format |
| 1100 | msgid "Partner Balance" |
| 1101 | msgstr "Balance des tiers" |
| 1102 | |
| 1103 | #. module: account_financial_report_webkit |
| 1104 | -#: code:addons/account_financial_report_webkit/report/general_ledger.py:146 |
| 1105 | +#: code:addons/account_financial_report_webkit/report/general_ledger.py:149 |
| 1106 | #, python-format |
| 1107 | msgid "Centralized Entries" |
| 1108 | msgstr "Ecritures centralisées" |
| 1109 | @@ -872,83 +957,98 @@ |
| 1110 | |
| 1111 | #. module: account_financial_report_webkit |
| 1112 | #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:31 |
| 1113 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:35 |
| 1114 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:44 |
| 1115 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:37 |
| 1116 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:47 |
| 1117 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:32 |
| 1118 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:27 |
| 1119 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:56 |
| 1120 | msgid "Dates Filter" |
| 1121 | msgstr "Filtre par date" |
| 1122 | |
| 1123 | #. module: account_financial_report_webkit |
| 1124 | -#: field:account.common.balance.report,fiscalyear_id:0 |
| 1125 | -#: field:general.ledger.webkit,fiscalyear_id:0 |
| 1126 | -#: field:open.invoices.webkit,fiscalyear_id:0 |
| 1127 | -#: field:partner.balance.webkit,fiscalyear_id:0 |
| 1128 | -#: field:partners.ledger.webkit,fiscalyear_id:0 |
| 1129 | -#: field:trial.balance.webkit,fiscalyear_id:0 |
| 1130 | -msgid "Fiscal year" |
| 1131 | -msgstr "Excercice comptable" |
| 1132 | +#: code:addons/account_financial_report_webkit/report/common_reports.py:67 |
| 1133 | +#: selection:general.ledger.webkit,display_account:0 |
| 1134 | +#, python-format |
| 1135 | +msgid "With transactions or non zero balance" |
| 1136 | +msgstr "Compte mouvementé ou dont le solde n'est pas nul" |
| 1137 | |
| 1138 | #. module: account_financial_report_webkit |
| 1139 | +#: selection:account.common.balance.report,comp0_filter:0 |
| 1140 | +#: selection:account.common.balance.report,comp1_filter:0 |
| 1141 | +#: selection:account.common.balance.report,comp2_filter:0 |
| 1142 | #: selection:account.common.balance.report,filter:0 |
| 1143 | -#: selection:general.ledger.webkit,filter:0 |
| 1144 | -#: selection:open.invoices.webkit,filter:0 |
| 1145 | -#: selection:partner.balance.webkit,filter:0 |
| 1146 | -#: selection:partners.ledger.webkit,filter:0 |
| 1147 | -#: selection:trial.balance.webkit,filter:0 |
| 1148 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:45 |
| 1149 | -#: code:addons/account_financial_report_webkit/wizard/balance_common.py:168 |
| 1150 | +#: code:addons/account_financial_report_webkit/wizard/balance_common.py:193 |
| 1151 | +#: selection:general.ledger.webkit,filter:0 |
| 1152 | +#: selection:open.invoices.webkit,filter:0 |
| 1153 | +#: selection:partner.balance.webkit,comp0_filter:0 |
| 1154 | +#: selection:partner.balance.webkit,comp1_filter:0 |
| 1155 | +#: selection:partner.balance.webkit,comp2_filter:0 |
| 1156 | +#: selection:partner.balance.webkit,filter:0 |
| 1157 | +#: selection:partners.ledger.webkit,filter:0 |
| 1158 | +#: view:print.journal.webkit:0 |
| 1159 | +#: selection:print.journal.webkit,filter:0 |
| 1160 | +#: selection:trial.balance.webkit,comp0_filter:0 |
| 1161 | +#: selection:trial.balance.webkit,comp1_filter:0 |
| 1162 | +#: selection:trial.balance.webkit,comp2_filter:0 |
| 1163 | +#: selection:trial.balance.webkit,filter:0 |
| 1164 | #, python-format |
| 1165 | msgid "Periods" |
| 1166 | msgstr "Periodes" |
| 1167 | |
| 1168 | #. module: account_financial_report_webkit |
| 1169 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:112 |
| 1170 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:127 |
| 1171 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:114 |
| 1172 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:121 |
| 1173 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:95 |
| 1174 | msgid "Curr. Balance" |
| 1175 | msgstr "Solde Devise" |
| 1176 | |
| 1177 | #. module: account_financial_report_webkit |
| 1178 | #: model:ir.model,name:account_financial_report_webkit.model_account_move_line |
| 1179 | msgid "Journal Items" |
| 1180 | -msgstr "Lignes d'écriture" |
| 1181 | +msgstr "Écritures comptables" |
| 1182 | |
| 1183 | #. module: account_financial_report_webkit |
| 1184 | -#: code:addons/account_financial_report_webkit/report/common_reports.py:416 |
| 1185 | +#: code:addons/account_financial_report_webkit/report/common_reports.py:424 |
| 1186 | #, python-format |
| 1187 | msgid "Invalid query mode" |
| 1188 | msgstr "Mode de recherche invalide" |
| 1189 | |
| 1190 | #. module: account_financial_report_webkit |
| 1191 | -#: code:addons/account_financial_report_webkit/report/open_invoices.py:161 |
| 1192 | +#: code:addons/account_financial_report_webkit/report/open_invoices.py:188 |
| 1193 | #, python-format |
| 1194 | msgid "Unsuported filter" |
| 1195 | msgstr "Filter non supporté" |
| 1196 | |
| 1197 | #. module: account_financial_report_webkit |
| 1198 | -#: code:addons/account_financial_report_webkit/report/common_reports.py:60 |
| 1199 | +#: code:addons/account_financial_report_webkit/report/common_reports.py:65 |
| 1200 | #, python-format |
| 1201 | msgid "All accounts" |
| 1202 | msgstr "Tout les comptes" |
| 1203 | |
| 1204 | #. module: account_financial_report_webkit |
| 1205 | +#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:128 |
| 1206 | +#, python-format |
| 1207 | +msgid "No diagnosis message was provided" |
| 1208 | +msgstr "No diagnosis message was provided" |
| 1209 | + |
| 1210 | +#. module: account_financial_report_webkit |
| 1211 | #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:93 |
| 1212 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:106 |
| 1213 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:102 |
| 1214 | msgid "Period" |
| 1215 | msgstr "Periode" |
| 1216 | |
| 1217 | #. module: account_financial_report_webkit |
| 1218 | -#: code:addons/account_financial_report_webkit/report/common_reports.py:424 |
| 1219 | +#: code:addons/account_financial_report_webkit/report/common_reports.py:432 |
| 1220 | #, python-format |
| 1221 | msgid "No valid filter" |
| 1222 | msgstr "Pas de filtre valide" |
| 1223 | |
| 1224 | #. module: account_financial_report_webkit |
| 1225 | -#: model:ir.ui.menu,name:account_financial_report_webkit.menu_account_open_invoices |
| 1226 | -msgid "Open Invoices" |
| 1227 | -msgstr "Etat des factures ouvertes" |
| 1228 | +#: view:partner.balance.webkit:0 |
| 1229 | +#: view:trial.balance.webkit:0 |
| 1230 | +msgid "{'required': [('filter', '=', 'filter_opening')]}" |
| 1231 | +msgstr "{'required': [('filter', '=', 'filter_opening')]}" |
| 1232 | |
| 1233 | #. module: account_financial_report_webkit |
| 1234 | #: view:open.invoices.webkit:0 |
| 1235 | @@ -956,15 +1056,7 @@ |
| 1236 | msgstr "Option d'analyse d'apurement de compte tiers" |
| 1237 | |
| 1238 | #. module: account_financial_report_webkit |
| 1239 | -#: selection:account.common.balance.report,filter:0 |
| 1240 | -#: selection:partner.balance.webkit,filter:0 |
| 1241 | -#: selection:trial.balance.webkit,filter:0 |
| 1242 | -msgid "Opening Only" |
| 1243 | -msgstr "Balance d'ouverture" |
| 1244 | - |
| 1245 | -#. module: account_financial_report_webkit |
| 1246 | #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:97 |
| 1247 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:110 |
| 1248 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:106 |
| 1249 | msgid "Journal" |
| 1250 | msgstr "Journal" |
| 1251 | @@ -973,6 +1065,7 @@ |
| 1252 | #: field:general.ledger.webkit,amount_currency:0 |
| 1253 | #: field:open.invoices.webkit,amount_currency:0 |
| 1254 | #: field:partners.ledger.webkit,amount_currency:0 |
| 1255 | +#: field:print.journal.webkit,amount_currency:0 |
| 1256 | msgid "With Currency" |
| 1257 | msgstr "Avec devise" |
| 1258 | |
| 1259 | @@ -989,23 +1082,25 @@ |
| 1260 | 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)" |
| 1261 | |
| 1262 | #. module: account_financial_report_webkit |
| 1263 | -#: code:addons/account_financial_report_webkit/report/profit_loss.py:42 |
| 1264 | -#, python-format |
| 1265 | -msgid "PROFIT AND LOSS" |
| 1266 | -msgstr "PROFIT AND LOSS" |
| 1267 | - |
| 1268 | -#. module: account_financial_report_webkit |
| 1269 | +#: field:account.common.balance.report,chart_account_id:0 |
| 1270 | #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:27 |
| 1271 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:31 |
| 1272 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:40 |
| 1273 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:33 |
| 1274 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:43 |
| 1275 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:28 |
| 1276 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:23 |
| 1277 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:39 |
| 1278 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:52 |
| 1279 | +#: field:general.ledger.webkit,chart_account_id:0 |
| 1280 | +#: field:open.invoices.webkit,chart_account_id:0 |
| 1281 | +#: field:partner.balance.webkit,chart_account_id:0 |
| 1282 | +#: field:partners.ledger.webkit,chart_account_id:0 |
| 1283 | +#: field:print.journal.webkit,chart_account_id:0 |
| 1284 | +#: field:trial.balance.webkit,chart_account_id:0 |
| 1285 | msgid "Chart of Account" |
| 1286 | msgstr "Plan comptable" |
| 1287 | |
| 1288 | #. module: account_financial_report_webkit |
| 1289 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:167 |
| 1290 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:173 |
| 1291 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:133 |
| 1292 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:148 |
| 1293 | msgid "Difference" |
| 1294 | @@ -1013,49 +1108,82 @@ |
| 1295 | |
| 1296 | #. module: account_financial_report_webkit |
| 1297 | #: field:account.common.balance.report,target_move:0 |
| 1298 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:37 |
| 1299 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:44 |
| 1300 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:54 |
| 1301 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:38 |
| 1302 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:33 |
| 1303 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:49 |
| 1304 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:62 |
| 1305 | #: field:general.ledger.webkit,target_move:0 |
| 1306 | #: field:open.invoices.webkit,target_move:0 |
| 1307 | #: field:partner.balance.webkit,target_move:0 |
| 1308 | #: field:partners.ledger.webkit,target_move:0 |
| 1309 | +#: field:print.journal.webkit,target_move:0 |
| 1310 | #: field:trial.balance.webkit,target_move:0 |
| 1311 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:37 |
| 1312 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:42 |
| 1313 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:51 |
| 1314 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:38 |
| 1315 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:49 |
| 1316 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:62 |
| 1317 | msgid "Target Moves" |
| 1318 | msgstr "Filtre d'écritures" |
| 1319 | |
| 1320 | #. module: account_financial_report_webkit |
| 1321 | #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:44 |
| 1322 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:49 |
| 1323 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:58 |
| 1324 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:51 |
| 1325 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:61 |
| 1326 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:45 |
| 1327 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:39 |
| 1328 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:56 |
| 1329 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:69 |
| 1330 | msgid "From:" |
| 1331 | msgstr "Depuis:" |
| 1332 | |
| 1333 | #. module: account_financial_report_webkit |
| 1334 | +#: field:account.common.balance.report,comp0_date_to:0 |
| 1335 | +#: field:account.common.balance.report,comp1_date_to:0 |
| 1336 | +#: field:account.common.balance.report,comp2_date_to:0 |
| 1337 | #: field:account.common.balance.report,date_to:0 |
| 1338 | #: field:general.ledger.webkit,date_to:0 |
| 1339 | #: field:open.invoices.webkit,date_to:0 |
| 1340 | +#: field:partner.balance.webkit,comp0_date_to:0 |
| 1341 | +#: field:partner.balance.webkit,comp1_date_to:0 |
| 1342 | +#: field:partner.balance.webkit,comp2_date_to:0 |
| 1343 | #: field:partner.balance.webkit,date_to:0 |
| 1344 | #: field:partners.ledger.webkit,date_to:0 |
| 1345 | +#: field:print.journal.webkit,date_to:0 |
| 1346 | +#: field:trial.balance.webkit,comp0_date_to:0 |
| 1347 | +#: field:trial.balance.webkit,comp1_date_to:0 |
| 1348 | +#: field:trial.balance.webkit,comp2_date_to:0 |
| 1349 | #: field:trial.balance.webkit,date_to:0 |
| 1350 | msgid "End Date" |
| 1351 | msgstr "Date Fin" |
| 1352 | |
| 1353 | #. module: account_financial_report_webkit |
| 1354 | +#: field:account.common.balance.report,comp0_period_from:0 |
| 1355 | +#: field:account.common.balance.report,comp1_period_from:0 |
| 1356 | +#: field:account.common.balance.report,comp2_period_from:0 |
| 1357 | +#: field:account.common.balance.report,period_from:0 |
| 1358 | +#: field:general.ledger.webkit,period_from:0 |
| 1359 | +#: field:open.invoices.webkit,period_from:0 |
| 1360 | +#: field:partner.balance.webkit,comp0_period_from:0 |
| 1361 | +#: field:partner.balance.webkit,comp1_period_from:0 |
| 1362 | +#: field:partner.balance.webkit,comp2_period_from:0 |
| 1363 | +#: field:partner.balance.webkit,period_from:0 |
| 1364 | +#: field:partners.ledger.webkit,period_from:0 |
| 1365 | +#: field:print.journal.webkit,period_from:0 |
| 1366 | +#: field:trial.balance.webkit,comp0_period_from:0 |
| 1367 | +#: field:trial.balance.webkit,comp1_period_from:0 |
| 1368 | +#: field:trial.balance.webkit,comp2_period_from:0 |
| 1369 | +#: field:trial.balance.webkit,period_from:0 |
| 1370 | +msgid "Start Period" |
| 1371 | +msgstr "Start Period" |
| 1372 | + |
| 1373 | +#. module: account_financial_report_webkit |
| 1374 | #: field:open.invoices.webkit,until_date:0 |
| 1375 | msgid "Clearance date" |
| 1376 | msgstr "Date d'apurement" |
| 1377 | |
| 1378 | #. module: account_financial_report_webkit |
| 1379 | -#: model:ir.model,name:account_financial_report_webkit.model_account_report_partners_ledger_webkit |
| 1380 | +#: model:ir.model,name:account_financial_report_webkit.model_partners_ledger_webkit |
| 1381 | msgid "Partner Ledger Report" |
| 1382 | -msgstr "Livre des tiers" |
| 1383 | +msgstr "Partner Ledger Report" |
| 1384 | |
| 1385 | #. module: account_financial_report_webkit |
| 1386 | #: view:open.invoices.webkit:0 |
| 1387 | @@ -1065,96 +1193,131 @@ |
| 1388 | msgstr "Filtre Partenaire" |
| 1389 | |
| 1390 | #. module: account_financial_report_webkit |
| 1391 | +#: selection:account.common.balance.report,comp0_filter:0 |
| 1392 | +#: field:account.common.balance.report,comp0_fiscalyear_id:0 |
| 1393 | +#: selection:account.common.balance.report,comp1_filter:0 |
| 1394 | +#: field:account.common.balance.report,comp1_fiscalyear_id:0 |
| 1395 | +#: selection:account.common.balance.report,comp2_filter:0 |
| 1396 | +#: field:account.common.balance.report,comp2_fiscalyear_id:0 |
| 1397 | +#: field:account.common.balance.report,fiscalyear_id:0 |
| 1398 | #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:28 |
| 1399 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:32 |
| 1400 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:41 |
| 1401 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:34 |
| 1402 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:44 |
| 1403 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:29 |
| 1404 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako:24 |
| 1405 | #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:40 |
| 1406 | #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:53 |
| 1407 | +#: field:general.ledger.webkit,fiscalyear_id:0 |
| 1408 | +#: field:open.invoices.webkit,fiscalyear_id:0 |
| 1409 | +#: selection:partner.balance.webkit,comp0_filter:0 |
| 1410 | +#: field:partner.balance.webkit,comp0_fiscalyear_id:0 |
| 1411 | +#: selection:partner.balance.webkit,comp1_filter:0 |
| 1412 | +#: field:partner.balance.webkit,comp1_fiscalyear_id:0 |
| 1413 | +#: selection:partner.balance.webkit,comp2_filter:0 |
| 1414 | +#: field:partner.balance.webkit,comp2_fiscalyear_id:0 |
| 1415 | +#: field:partner.balance.webkit,fiscalyear_id:0 |
| 1416 | +#: field:partners.ledger.webkit,fiscalyear_id:0 |
| 1417 | +#: field:print.journal.webkit,fiscalyear_id:0 |
| 1418 | +#: selection:trial.balance.webkit,comp0_filter:0 |
| 1419 | +#: field:trial.balance.webkit,comp0_fiscalyear_id:0 |
| 1420 | +#: selection:trial.balance.webkit,comp1_filter:0 |
| 1421 | +#: field:trial.balance.webkit,comp1_fiscalyear_id:0 |
| 1422 | +#: selection:trial.balance.webkit,comp2_filter:0 |
| 1423 | +#: field:trial.balance.webkit,comp2_fiscalyear_id:0 |
| 1424 | +#: field:trial.balance.webkit,fiscalyear_id:0 |
| 1425 | msgid "Fiscal Year" |
| 1426 | msgstr "Excercice comptable" |
| 1427 | |
| 1428 | #. module: account_financial_report_webkit |
| 1429 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:77 |
| 1430 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:94 |
| 1431 | -msgid "Yes" |
| 1432 | -msgstr "Oui" |
| 1433 | - |
| 1434 | -#. module: account_financial_report_webkit |
| 1435 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:95 |
| 1436 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:108 |
| 1437 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:104 |
| 1438 | -msgid "Entry" |
| 1439 | -msgstr "Ecriture" |
| 1440 | - |
| 1441 | -#. module: account_financial_report_webkit |
| 1442 | -#: code:addons/account_financial_report_webkit/report/general_ledger.py:64 |
| 1443 | -#: code:addons/account_financial_report_webkit/report/open_invoices.py:63 |
| 1444 | +#: selection:account.common.balance.report,comp0_filter:0 |
| 1445 | +#: selection:account.common.balance.report,comp1_filter:0 |
| 1446 | +#: selection:account.common.balance.report,comp2_filter:0 |
| 1447 | +#: selection:partner.balance.webkit,comp0_filter:0 |
| 1448 | +#: selection:partner.balance.webkit,comp1_filter:0 |
| 1449 | +#: selection:partner.balance.webkit,comp2_filter:0 |
| 1450 | +#: selection:trial.balance.webkit,comp0_filter:0 |
| 1451 | +#: selection:trial.balance.webkit,comp1_filter:0 |
| 1452 | +#: selection:trial.balance.webkit,comp2_filter:0 |
| 1453 | +msgid "No Comparison" |
| 1454 | +msgstr "No Comparison" |
| 1455 | + |
| 1456 | +#. module: account_financial_report_webkit |
| 1457 | +#: help:account.move.line,last_rec_date:0 |
| 1458 | +msgid "the date of the last reconciliation (full or partial) account move line" |
| 1459 | +msgstr "Date du léttrage le plus récent (total ou partiel) c'est à dire du dernier paiement" |
| 1460 | + |
| 1461 | +#. module: account_financial_report_webkit |
| 1462 | +#: code:addons/account_financial_report_webkit/report/general_ledger.py:65 |
| 1463 | +#: code:addons/account_financial_report_webkit/report/open_invoices.py:76 |
| 1464 | #: code:addons/account_financial_report_webkit/report/partner_balance.py:63 |
| 1465 | #: code:addons/account_financial_report_webkit/report/partners_ledger.py:64 |
| 1466 | -#: code:addons/account_financial_report_webkit/report/profit_loss.py:71 |
| 1467 | -#: code:addons/account_financial_report_webkit/report/trial_balance.py:64 |
| 1468 | -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:67 |
| 1469 | +#: code:addons/account_financial_report_webkit/report/print_journal.py:65 |
| 1470 | +#: code:addons/account_financial_report_webkit/report/trial_balance.py:66 |
| 1471 | #, python-format |
| 1472 | msgid "Page" |
| 1473 | msgstr "Page" |
| 1474 | |
| 1475 | #. module: account_financial_report_webkit |
| 1476 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:50 |
| 1477 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:53 |
| 1478 | msgid "Partners Filter" |
| 1479 | msgstr "Filtre Partenaire" |
| 1480 | |
| 1481 | #. module: account_financial_report_webkit |
| 1482 | -#: code:addons/account_financial_report_webkit/report/open_invoices.py:102 |
| 1483 | -#: code:addons/account_financial_report_webkit/report/partners_ledger.py:102 |
| 1484 | +#: code:addons/account_financial_report_webkit/report/open_invoices.py:127 |
| 1485 | +#: code:addons/account_financial_report_webkit/report/partners_ledger.py:112 |
| 1486 | #, python-format |
| 1487 | msgid "No accounts to print." |
| 1488 | msgstr "Aucun compte à imprimer" |
| 1489 | |
| 1490 | #. module: account_financial_report_webkit |
| 1491 | -#: code:addons/account_financial_report_webkit/report/profit_loss.py:49 |
| 1492 | -#, python-format |
| 1493 | -msgid "Profit and Loss" |
| 1494 | -msgstr "Perte et profit" |
| 1495 | - |
| 1496 | -#. module: account_financial_report_webkit |
| 1497 | -#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:99 |
| 1498 | #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:95 |
| 1499 | msgid "No Partner" |
| 1500 | msgstr "Pas de partenaire" |
| 1501 | |
| 1502 | #. module: account_financial_report_webkit |
| 1503 | -#: code:addons/account_financial_report_webkit/report/open_invoices.py:41 |
| 1504 | +#: code:addons/account_financial_report_webkit/report/open_invoices.py:54 |
| 1505 | #, python-format |
| 1506 | msgid "OPEN INVOICES REPORT" |
| 1507 | msgstr "ETAT DES FACTURES OUVERTES" |
| 1508 | |
| 1509 | #. module: account_financial_report_webkit |
| 1510 | #: code:addons/account_financial_report_webkit/report/partners_ledger.py:41 |
| 1511 | -#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:57 |
| 1512 | #, python-format |
| 1513 | msgid "PARTNER LEDGER" |
| 1514 | msgstr "LIVRE DES TIERS" |
| 1515 | |
| 1516 | #. module: account_financial_report_webkit |
| 1517 | -#: selection:account.common.balance.report,target_move:0 |
| 1518 | -#: selection:general.ledger.webkit,target_move:0 |
| 1519 | -#: selection:open.invoices.webkit,target_move:0 |
| 1520 | -#: selection:partner.balance.webkit,target_move:0 |
| 1521 | -#: selection:partners.ledger.webkit,target_move:0 |
| 1522 | -#: selection:trial.balance.webkit,target_move:0 |
| 1523 | -#: code:addons/account_financial_report_webkit/report/common_reports.py:82 |
| 1524 | -#, python-format |
| 1525 | -msgid "All Entries" |
| 1526 | -msgstr "Ecritures validées + brouillon" |
| 1527 | - |
| 1528 | -#. module: account_financial_report_webkit |
| 1529 | -#: sql_constraint:account.move.line:0 |
| 1530 | -msgid "Wrong credit or debit value in accounting entry !" |
| 1531 | -msgstr "Valeur erronée au crédit ou au débit dans l'écriture comptable !" |
| 1532 | - |
| 1533 | -#. module: account_financial_report_webkit |
| 1534 | -#: constraint:account.move.line:0 |
| 1535 | -msgid "You can not create move line on view account." |
| 1536 | -msgstr "Vous ne pouvez pas créer de ligne d'écriture sur un compte de type \"Vue\"." |
| 1537 | +#: code:addons/account_financial_report_webkit/report/common_reports.py:354 |
| 1538 | +#, python-format |
| 1539 | +msgid "No opening period found to compute the opening balances.\n" |
| 1540 | +"You have to configure a period on the first of January with the special flag." |
| 1541 | +msgstr "No opening period found to compute the opening balances.\n" |
| 1542 | +"You have to configure a period on the first of January with the special flag." |
| 1543 | + |
| 1544 | +#. module: account_financial_report_webkit |
| 1545 | +#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:130 |
| 1546 | +#, python-format |
| 1547 | +msgid "The following diagnosis message was provided:\n" |
| 1548 | +"" |
| 1549 | +msgstr "The following diagnosis message was provided:\n" |
| 1550 | +"" |
| 1551 | + |
| 1552 | +#. module: account_financial_report_webkit |
| 1553 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:77 |
| 1554 | +#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:94 |
| 1555 | +msgid "Yes" |
| 1556 | +msgstr "Oui" |
| 1557 | + |
| 1558 | +#. module: account_financial_report_webkit |
| 1559 | +#: field:account.common.balance.report,comp0_filter:0 |
| 1560 | +#: field:account.common.balance.report,comp1_filter:0 |
| 1561 | +#: field:account.common.balance.report,comp2_filter:0 |
| 1562 | +#: field:partner.balance.webkit,comp0_filter:0 |
| 1563 | +#: field:partner.balance.webkit,comp1_filter:0 |
| 1564 | +#: field:partner.balance.webkit,comp2_filter:0 |
| 1565 | +#: field:trial.balance.webkit,comp0_filter:0 |
| 1566 | +#: field:trial.balance.webkit,comp1_filter:0 |
| 1567 | +#: field:trial.balance.webkit,comp2_filter:0 |
| 1568 | +msgid "Compare By" |
| 1569 | +msgstr "Compare By" |
| 1570 | |
| 1571 | |
| 1572 | === modified file 'account_financial_report_webkit/report/__init__.py' |
| 1573 | --- account_financial_report_webkit/report/__init__.py 2012-12-12 06:52:56 +0000 |
| 1574 | +++ account_financial_report_webkit/report/__init__.py 2013-09-13 22:49:16 +0000 |
| 1575 | @@ -8,3 +8,4 @@ |
| 1576 | from . import trial_balance |
| 1577 | from . import partner_balance |
| 1578 | from . import open_invoices |
| 1579 | +from . import print_journal |
| 1580 | |
| 1581 | === modified file 'account_financial_report_webkit/report/common_reports.py' |
| 1582 | --- account_financial_report_webkit/report/common_reports.py 2012-12-11 16:32:26 +0000 |
| 1583 | +++ account_financial_report_webkit/report/common_reports.py 2013-09-13 22:49:16 +0000 |
| 1584 | @@ -56,6 +56,9 @@ |
| 1585 | return self.pool.get(model).browse(self.cursor, self.uid, info) |
| 1586 | return False |
| 1587 | |
| 1588 | + def _get_journals_br(self, data): |
| 1589 | + return self._get_info(data, 'journal_ids', 'account.journal') |
| 1590 | + |
| 1591 | def _get_display_account(self, data): |
| 1592 | val = self._get_form_param('display_account', data) |
| 1593 | if val == 'bal_all': |
| 1594 | |
| 1595 | === added file 'account_financial_report_webkit/report/print_journal.py' |
| 1596 | --- account_financial_report_webkit/report/print_journal.py 1970-01-01 00:00:00 +0000 |
| 1597 | +++ account_financial_report_webkit/report/print_journal.py 2013-09-13 22:49:16 +0000 |
| 1598 | @@ -0,0 +1,147 @@ |
| 1599 | +# -*- coding: utf-8 -*- |
| 1600 | +############################################################################## |
| 1601 | +# |
| 1602 | +# account_financial_report_webkit module for OpenERP, Webkit based extended report financial report |
| 1603 | +# Copyright (C) 2012 SYLEAM Info Services (<http://www.syleam.fr/>) |
| 1604 | +# Sebastien LANGE <sebastien.lange@syleam.fr> |
| 1605 | +# |
| 1606 | +# This file is a part of account_financial_report_webkit |
| 1607 | +# |
| 1608 | +# account_financial_report_webkit is free software: you can redistribute it and/or modify |
| 1609 | +# it under the terms of the GNU Affero General Public License as published by |
| 1610 | +# the Free Software Foundation, either version 3 of the License, or |
| 1611 | +# (at your option) any later version. |
| 1612 | +# |
| 1613 | +# account_financial_report_webkit is distributed in the hope that it will be useful, |
| 1614 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 1615 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 1616 | +# GNU Affero General Public License for more details. |
| 1617 | +# |
| 1618 | +# You should have received a copy of the GNU Affero General Public License |
| 1619 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 1620 | +# |
| 1621 | +############################################################################## |
| 1622 | + |
| 1623 | +from report import report_sxw |
| 1624 | +from tools.translate import _ |
| 1625 | +import pooler |
| 1626 | +from datetime import datetime |
| 1627 | + |
| 1628 | +from common_reports import CommonReportHeaderWebkit |
| 1629 | +from webkit_parser_header_fix import HeaderFooterTextWebKitParser |
| 1630 | + |
| 1631 | + |
| 1632 | +class PrintJournalWebkit(report_sxw.rml_parse, CommonReportHeaderWebkit): |
| 1633 | + |
| 1634 | + def __init__(self, cursor, uid, name, context): |
| 1635 | + super(PrintJournalWebkit, self).__init__(cursor, uid, name, context=context) |
| 1636 | + self.pool = pooler.get_pool(self.cr.dbname) |
| 1637 | + self.cursor = self.cr |
| 1638 | + |
| 1639 | + company_obj = self.pool.get('res.company') |
| 1640 | + |
| 1641 | + company_id = company_obj._company_default_get(self.cr, uid, 'res.users', context=context) |
| 1642 | + company = company_obj.browse(self.cr, uid, company_id, context=context) |
| 1643 | + header_report_name = ' - '.join((_('JOURNALS'), company.name, company.currency_id.name)) |
| 1644 | + |
| 1645 | + footer_date_time = self.formatLang(str(datetime.today()), date_time=True) |
| 1646 | + |
| 1647 | + self.localcontext.update({ |
| 1648 | + 'cr': cursor, |
| 1649 | + 'uid': uid, |
| 1650 | + 'report_name': _('Journals'), |
| 1651 | + 'display_account_raw': self._get_display_account_raw, |
| 1652 | + 'filter_form': self._get_filter, |
| 1653 | + 'target_move': self._get_target_move, |
| 1654 | + 'initial_balance': self._get_initial_balance, |
| 1655 | + 'amount_currency': self._get_amount_currency, |
| 1656 | + 'display_partner_account': self._get_display_partner_account, |
| 1657 | + 'display_target_move': self._get_display_target_move, |
| 1658 | + 'journals': self._get_journals_br, |
| 1659 | + 'additional_args': [ |
| 1660 | + ('--header-font-name', 'Helvetica'), |
| 1661 | + ('--footer-font-name', 'Helvetica'), |
| 1662 | + ('--header-font-size', '10'), |
| 1663 | + ('--footer-font-size', '6'), |
| 1664 | + ('--header-left', header_report_name), |
| 1665 | + ('--header-spacing', '2'), |
| 1666 | + ('--footer-left', footer_date_time), |
| 1667 | + ('--footer-right', ' '.join((_('Page'), '[page]', _('of'), '[topage]'))), |
| 1668 | + ('--footer-line',), |
| 1669 | + ], |
| 1670 | + }) |
| 1671 | + |
| 1672 | + def set_context(self, objects, data, ids, report_type=None): |
| 1673 | + """Populate a ledger_lines attribute on each browse record that will be used |
| 1674 | + by mako template""" |
| 1675 | + |
| 1676 | + # Reading form |
| 1677 | + main_filter = self._get_form_param('filter', data, default='filter_no') |
| 1678 | + target_move = self._get_form_param('target_move', data, default='all') |
| 1679 | + start_date = self._get_form_param('date_from', data) |
| 1680 | + stop_date = self._get_form_param('date_to', data) |
| 1681 | + start_period = self.get_start_period_br(data) |
| 1682 | + stop_period = self.get_end_period_br(data) |
| 1683 | + fiscalyear = self.get_fiscalyear_br(data) |
| 1684 | + journal_ids = self._get_form_param('journal_ids', data) |
| 1685 | + chart_account = self._get_chart_account_id_br(data) |
| 1686 | + account_period_obj = self.pool.get('account.period') |
| 1687 | + |
| 1688 | + domain = [('journal_id', 'in', journal_ids)] |
| 1689 | + if main_filter == 'filter_no': |
| 1690 | + domain += [ |
| 1691 | + ('date', '>=', self.get_first_fiscalyear_period(fiscalyear).date_start), |
| 1692 | + ('date', '<=', self.get_last_fiscalyear_period(fiscalyear).date_stop), |
| 1693 | + ] |
| 1694 | + # computation of move lines |
| 1695 | + elif main_filter == 'filter_date': |
| 1696 | + domain += [ |
| 1697 | + ('date', '>=', start_date), |
| 1698 | + ('date', '<=', stop_date), |
| 1699 | + ] |
| 1700 | + elif main_filter == 'filter_period': |
| 1701 | + period_ids = account_period_obj.build_ctx_periods(self.cursor, self.uid, start_period.id, stop_period.id) |
| 1702 | + domain = [ |
| 1703 | + ('period_id', 'in', period_ids), |
| 1704 | + ] |
| 1705 | + if target_move == 'posted': |
| 1706 | + domain += [('state', '=', 'posted')] |
| 1707 | + account_journal_period_obj = self.pool.get('account.journal.period') |
| 1708 | + new_ids = account_journal_period_obj.search(self.cursor, self.uid, [ |
| 1709 | + ('journal_id', 'in', journal_ids), |
| 1710 | + ('period_id', 'in', period_ids), |
| 1711 | + ]) |
| 1712 | + objects = account_journal_period_obj.browse(self.cursor, self.uid, new_ids) |
| 1713 | + # Sort by journal and period |
| 1714 | + objects.sort(key=lambda a: (a.journal_id.code, a.period_id.date_start)) |
| 1715 | + move_obj = self.pool.get('account.move') |
| 1716 | + for journal_period in objects: |
| 1717 | + domain_arg = [ |
| 1718 | + ('journal_id', '=', journal_period.journal_id.id), |
| 1719 | + ('period_id', '=', journal_period.period_id.id), |
| 1720 | + ] |
| 1721 | + if target_move == 'posted': |
| 1722 | + domain_arg += [('state', '=', 'posted')] |
| 1723 | + move_ids = move_obj.search(self.cursor, self.uid, domain_arg, order="name") |
| 1724 | + journal_period.moves = move_obj.browse(self.cursor, self.uid, move_ids) |
| 1725 | + # Sort account move line by account accountant |
| 1726 | + for move in journal_period.moves: |
| 1727 | + move.line_id.sort(key=lambda a: (a.date, a.account_id.code)) |
| 1728 | + |
| 1729 | + self.localcontext.update({ |
| 1730 | + 'fiscalyear': fiscalyear, |
| 1731 | + 'start_date': start_date, |
| 1732 | + 'stop_date': stop_date, |
| 1733 | + 'start_period': start_period, |
| 1734 | + 'stop_period': stop_period, |
| 1735 | + 'chart_account': chart_account, |
| 1736 | + }) |
| 1737 | + |
| 1738 | + return super(PrintJournalWebkit, self).set_context(objects, data, new_ids, report_type=report_type) |
| 1739 | + |
| 1740 | +HeaderFooterTextWebKitParser('report.account.account_report_print_journal_webkit', |
| 1741 | + 'account.journal.period', |
| 1742 | + 'addons/account_financial_report_webkit/report/templates/account_report_print_journal.mako', |
| 1743 | + parser=PrintJournalWebkit) |
| 1744 | + |
| 1745 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
| 1746 | |
| 1747 | === modified file 'account_financial_report_webkit/report/report.xml' |
| 1748 | --- account_financial_report_webkit/report/report.xml 2012-12-12 06:52:56 +0000 |
| 1749 | +++ account_financial_report_webkit/report/report.xml 2013-09-13 22:49:16 +0000 |
| 1750 | @@ -111,5 +111,25 @@ |
| 1751 | <field eval="'ir.actions.report.xml,'+str(ref('account_financial_report_webkit.account_report_open_invoices_webkit'))" model="ir.actions.report.xml" name="res_id"/> |
| 1752 | </record> |
| 1753 | |
| 1754 | + <record id="account_report_print_journal_webkit" model="ir.actions.report.xml"> |
| 1755 | + <field name="report_type">webkit</field> |
| 1756 | + <field name="report_name">account.account_report_print_journal_webkit</field> |
| 1757 | + <field eval="[(6,0,[])]" name="groups_id"/> |
| 1758 | + <field eval="0" name="multi"/> |
| 1759 | + <field eval="0" name="auto"/> |
| 1760 | + <field eval="1" name="header"/> |
| 1761 | + <field name="model">account.move</field> |
| 1762 | + <field name="type">ir.actions.report.xml</field> |
| 1763 | + <field name="name">Journals</field> |
| 1764 | + <field name="report_rml">account_financial_report_webkit/report/templates/account_report_print_journal.mako</field> |
| 1765 | + <field name="report_file">account_financial_report_webkit/report/templates/account_report_print_journal.mako</field> |
| 1766 | + </record> |
| 1767 | + <record id="property_account_report_open_invoices_webkit" model="ir.property"> |
| 1768 | + <field name="name">account_report_print_journal_webkit</field> |
| 1769 | + <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/> |
| 1770 | + <field eval="'ir.header_webkit,'+str(ref('account_financial_report_webkit.financial_landscape_header'))" model="ir.header_webkit" name="value"/> |
| 1771 | + <field eval="'ir.actions.report.xml,'+str(ref('account_financial_report_webkit.account_report_print_journal_webkit'))" model="ir.actions.report.xml" name="res_id"/> |
| 1772 | + </record> |
| 1773 | + |
| 1774 | </data> |
| 1775 | </openerp> |
| 1776 | |
| 1777 | === added file 'account_financial_report_webkit/report/templates/account_report_print_journal.mako' |
| 1778 | --- account_financial_report_webkit/report/templates/account_report_print_journal.mako 1970-01-01 00:00:00 +0000 |
| 1779 | +++ account_financial_report_webkit/report/templates/account_report_print_journal.mako 2013-09-13 22:49:16 +0000 |
| 1780 | @@ -0,0 +1,169 @@ |
| 1781 | +<!DOCTYPE html SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
| 1782 | +<html xmlns="http://www.w3.org/1999/xhtml"> |
| 1783 | + <head> |
| 1784 | + <style type="text/css"> |
| 1785 | + .overflow_ellipsis { |
| 1786 | + text-overflow: ellipsis; |
| 1787 | + overflow: hidden; |
| 1788 | + white-space: nowrap; |
| 1789 | + } |
| 1790 | + ${css} |
| 1791 | + </style> |
| 1792 | + </head> |
| 1793 | + <body> |
| 1794 | + <%! |
| 1795 | + def amount(text): |
| 1796 | + return text.replace('-', '‑') # replace by a non-breaking hyphen (it will not word-wrap between hyphen and numbers) |
| 1797 | + %> |
| 1798 | + |
| 1799 | + <%setLang(user.lang)%> |
| 1800 | + |
| 1801 | + <div class="act_as_table data_table"> |
| 1802 | + <div class="act_as_row labels"> |
| 1803 | + <div class="act_as_cell">${_('Chart of Account')}</div> |
| 1804 | + <div class="act_as_cell">${_('Fiscal Year')}</div> |
| 1805 | + <div class="act_as_cell"> |
| 1806 | + %if filter_form(data) == 'filter_date': |
| 1807 | + ${_('Dates Filter')} |
| 1808 | + %else: |
| 1809 | + ${_('Periods Filter')} |
| 1810 | + %endif |
| 1811 | + </div> |
| 1812 | + <div class="act_as_cell">${_('Journal Filter')}</div> |
| 1813 | + <div class="act_as_cell">${_('Target Moves')}</div> |
| 1814 | + </div> |
| 1815 | + <div class="act_as_row"> |
| 1816 | + <div class="act_as_cell">${ chart_account.name }</div> |
| 1817 | + <div class="act_as_cell">${ fiscalyear.name if fiscalyear else '-' }</div> |
| 1818 | + <div class="act_as_cell"> |
| 1819 | + ${_('From:')} |
| 1820 | + %if filter_form(data) == 'filter_date': |
| 1821 | + ${formatLang(start_date, date=True) if start_date else u'' } |
| 1822 | + %else: |
| 1823 | + ${start_period.name if start_period else u''} |
| 1824 | + %endif |
| 1825 | + ${_('To:')} |
| 1826 | + %if filter_form(data) == 'filter_date': |
| 1827 | + ${ formatLang(stop_date, date=True) if stop_date else u'' } |
| 1828 | + %else: |
| 1829 | + ${stop_period.name if stop_period else u'' } |
| 1830 | + %endif |
| 1831 | + </div> |
| 1832 | + <div class="act_as_cell"> |
| 1833 | + %if journals(data): |
| 1834 | + ${', '.join([journal.name for journal in journals(data)])} |
| 1835 | + %else: |
| 1836 | + ${_('All')} |
| 1837 | + %endif |
| 1838 | + |
| 1839 | + </div> |
| 1840 | + <div class="act_as_cell">${ display_target_move(data) }</div> |
| 1841 | + </div> |
| 1842 | + </div> |
| 1843 | + |
| 1844 | + %for journal_period in objects: |
| 1845 | + <% |
| 1846 | + account_total_debit = 0.0 |
| 1847 | + account_total_credit = 0.0 |
| 1848 | + account_total_currency = 0.0 |
| 1849 | + %> |
| 1850 | + |
| 1851 | + <div class="account_title bg" style="width: 1080px; margin-top: 20px; font-size: 12px;">${journal_period.journal_id.name} - ${journal_period.period_id.name}</div> |
| 1852 | + |
| 1853 | + <!-- we use div with css instead of table for tabular data because div do not cut rows at half at page breaks --> |
| 1854 | + <div class="act_as_table list_table" style="margin-top: 5px;"> |
| 1855 | + <div class="act_as_thead"> |
| 1856 | + <div class="act_as_row labels"> |
| 1857 | + ## date |
| 1858 | + <div class="act_as_cell first_column">${_('Date')}</div> |
| 1859 | + ## move |
| 1860 | + <div class="act_as_cell">${_('Entry')}</div> |
| 1861 | + ## account code |
| 1862 | + <div class="act_as_cell">${_('Account')}</div> |
| 1863 | + ## date |
| 1864 | + <div class="act_as_cell">${_('Due Date')}</div> |
| 1865 | + ## partner |
| 1866 | + <div class="act_as_cell" style="width: 280px;">${_('Partner')}</div> |
| 1867 | + ## label |
| 1868 | + <div class="act_as_cell" style="width: 310px;">${_('Label')}</div> |
| 1869 | + ## debit |
| 1870 | + <div class="act_as_cell amount">${_('Debit')}</div> |
| 1871 | + ## credit |
| 1872 | + <div class="act_as_cell amount">${_('Credit')}</div> |
| 1873 | + %if amount_currency(data): |
| 1874 | + ## currency balance |
| 1875 | + <div class="act_as_cell amount sep_left">${_('Curr. Balance')}</div> |
| 1876 | + ## curency code |
| 1877 | + <div class="act_as_cell amount" style="text-align: right;">${_('Curr.')}</div> |
| 1878 | + %endif |
| 1879 | + </div> |
| 1880 | + </div> |
| 1881 | + %for move in journal_period.moves: |
| 1882 | + <% |
| 1883 | + new_move = True |
| 1884 | + %> |
| 1885 | + |
| 1886 | + %for line in move.line_id: |
| 1887 | + <div class="act_as_tbody"> |
| 1888 | + <% |
| 1889 | + account_total_debit += line.debit or 0.0 |
| 1890 | + account_total_credit += line.credit or 0.0 |
| 1891 | + %> |
| 1892 | + <div class="act_as_row lines"> |
| 1893 | + ## date |
| 1894 | + <div class="act_as_cell first_column">${formatLang(move.date, date=True) if new_move else ''}</div> |
| 1895 | + ## move |
| 1896 | + <div class="act_as_cell">${move.name if new_move else ''}</div> |
| 1897 | + ## account code |
| 1898 | + <div class="act_as_cell">${line.account_id.code}</div> |
| 1899 | + ## date |
| 1900 | + <div class="act_as_cell">${formatLang(line.date_maturity or '', date=True)}</div> |
| 1901 | + ## partner |
| 1902 | + <div class="act_as_cell overflow_ellipsis" style="width: 280px;">${line.partner_id.name if new_move else ''}</div> |
| 1903 | + ## label |
| 1904 | + <div class="act_as_cell overflow_ellipsis" style="width: 310px;">${line.name}</div> |
| 1905 | + ## debit |
| 1906 | + <div class="act_as_cell amount">${formatLang(line.debit) if line.debit else ''}</div> |
| 1907 | + ## credit |
| 1908 | + <div class="act_as_cell amount">${formatLang(line.credit) if line.credit else ''}</div> |
| 1909 | + %if amount_currency(data): |
| 1910 | + ## currency balance |
| 1911 | + <div class="act_as_cell amount sep_left">${formatLang(line.amount_currency) if line.amount_currency else ''}</div> |
| 1912 | + ## curency code |
| 1913 | + <div class="act_as_cell amount" style="text-align: right;">${line.currency_id.symbol or ''}</div> |
| 1914 | + %endif |
| 1915 | + </div> |
| 1916 | + <% |
| 1917 | + new_move = False |
| 1918 | + %> |
| 1919 | + </div> |
| 1920 | + %endfor |
| 1921 | + %endfor |
| 1922 | + <div class="act_as_row lines labels"> |
| 1923 | + ## date |
| 1924 | + <div class="act_as_cell first_column"></div> |
| 1925 | + ## move |
| 1926 | + <div class="act_as_cell"></div> |
| 1927 | + ## account code |
| 1928 | + <div class="act_as_cell"></div> |
| 1929 | + ## date |
| 1930 | + <div class="act_as_cell"></div> |
| 1931 | + ## partner |
| 1932 | + <div class="act_as_cell" style="width: 280px;"></div> |
| 1933 | + ## label |
| 1934 | + <div class="act_as_cell" style="width: 310px;"></div> |
| 1935 | + ## debit |
| 1936 | + <div class="act_as_cell amount">${formatLang(account_total_debit) | amount }</div> |
| 1937 | + ## credit |
| 1938 | + <div class="act_as_cell amount">${formatLang(account_total_credit) | amount }</div> |
| 1939 | + %if amount_currency(data): |
| 1940 | + ## currency balance |
| 1941 | + <div class="act_as_cell amount sep_left"></div> |
| 1942 | + ## currency code |
| 1943 | + <div class="act_as_cell" style="text-align: right; right;"></div> |
| 1944 | + %endif |
| 1945 | + </div> |
| 1946 | + </div> |
| 1947 | + %endfor |
| 1948 | + </body> |
| 1949 | +</html> |
| 1950 | |
| 1951 | === modified file 'account_financial_report_webkit/report_menus.xml' |
| 1952 | --- account_financial_report_webkit/report_menus.xml 2012-03-06 09:13:59 +0000 |
| 1953 | +++ account_financial_report_webkit/report_menus.xml 2013-09-13 22:49:16 +0000 |
| 1954 | @@ -22,5 +22,14 @@ |
| 1955 | parent="account.next_id_22" action="action_account_open_invoices_menu_webkit" |
| 1956 | groups="account.group_account_manager,account.group_account_user" id="menu_account_open_invoices"/> |
| 1957 | |
| 1958 | + <menuitem icon="STOCK_PRINT" name="Journals" |
| 1959 | + parent="account.menu_journals_report" action="action_account_print_journal_menu_webkit" |
| 1960 | + groups="account.group_account_manager,account.group_account_user" id="account.menu_account_print_journal"/> |
| 1961 | + |
| 1962 | + <menuitem icon="STOCK_PRINT" name="Sale/Purchase Journals" |
| 1963 | + parent="account.menu_journals_report" action="action_account_print_journal_sale_purchase_menu_webkit" |
| 1964 | + groups="account.group_account_manager,account.group_account_user" id="account.menu_account_print_sale_purchase_journal" |
| 1965 | + sequence="1"/> |
| 1966 | + |
| 1967 | </data> |
| 1968 | </openerp> |
| 1969 | |
| 1970 | === modified file 'account_financial_report_webkit/wizard/__init__.py' |
| 1971 | --- account_financial_report_webkit/wizard/__init__.py 2012-12-12 06:52:56 +0000 |
| 1972 | +++ account_financial_report_webkit/wizard/__init__.py 2013-09-13 22:49:16 +0000 |
| 1973 | @@ -2,6 +2,8 @@ |
| 1974 | ############################################################################## |
| 1975 | # |
| 1976 | # Author: Nicolas Bessi. Copyright Camptocamp SA |
| 1977 | +# Copyright (C) 2012 SYLEAM Info Services (<http://www.syleam.fr/>) |
| 1978 | +# Sebastien LANGE <sebastien.lange@syleam.fr> |
| 1979 | # |
| 1980 | # This program is free software: you can redistribute it and/or modify |
| 1981 | # it under the terms of the GNU Affero General Public License as |
| 1982 | @@ -24,3 +26,4 @@ |
| 1983 | from . import trial_balance_wizard |
| 1984 | from . import partner_balance_wizard |
| 1985 | from . import open_invoices_wizard |
| 1986 | +from . import print_journal |
| 1987 | |
| 1988 | === added file 'account_financial_report_webkit/wizard/print_journal.py' |
| 1989 | --- account_financial_report_webkit/wizard/print_journal.py 1970-01-01 00:00:00 +0000 |
| 1990 | +++ account_financial_report_webkit/wizard/print_journal.py 2013-09-13 22:49:16 +0000 |
| 1991 | @@ -0,0 +1,139 @@ |
| 1992 | +# -*- coding: utf-8 -*- |
| 1993 | +############################################################################## |
| 1994 | +# |
| 1995 | +# account_financial_report_webkit module for OpenERP |
| 1996 | +# Copyright (C) 2012 SYLEAM Info Services (<http://www.syleam.fr/>) |
| 1997 | +# Sebastien LANGE <sebastien.lange@syleam.fr> |
| 1998 | +# |
| 1999 | +# This file is a part of account_financial_report_webkit |
| 2000 | +# |
| 2001 | +# account_financial_report_webkit is free software: you can redistribute it and/or modify |
| 2002 | +# it under the terms of the GNU Affero General Public License as published by |
| 2003 | +# the Free Software Foundation, either version 3 of the License, or |
| 2004 | +# (at your option) any later version. |
| 2005 | +# |
| 2006 | +# account_financial_report_webkit is distributed in the hope that it will be useful, |
| 2007 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 2008 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 2009 | +# GNU Affero General Public License for more details. |
| 2010 | +# |
| 2011 | +# You should have received a copy of the GNU Affero General Public License |
| 2012 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 2013 | +# |
| 2014 | +############################################################################## |
| 2015 | + |
| 2016 | +from osv import osv |
| 2017 | +from osv import fields |
| 2018 | +import time |
| 2019 | +from lxml import etree |
| 2020 | + |
| 2021 | + |
| 2022 | +class AccountReportPrintJournalWizard(osv.osv_memory): |
| 2023 | + """Will launch print journal report and pass requiered args""" |
| 2024 | + |
| 2025 | + _inherit = "account.common.account.report" |
| 2026 | + _name = "print.journal.webkit" |
| 2027 | + _description = "Journals Report" |
| 2028 | + |
| 2029 | + _columns = { |
| 2030 | + 'amount_currency': fields.boolean("With Currency", help="It adds the currency column"), |
| 2031 | + } |
| 2032 | + |
| 2033 | + _defaults = { |
| 2034 | + 'amount_currency': False, |
| 2035 | + 'journal_ids': False, |
| 2036 | + 'filter': 'filter_period', |
| 2037 | + } |
| 2038 | + |
| 2039 | + def _check_fiscalyear(self, cr, uid, ids, context=None): |
| 2040 | + obj = self.read(cr, uid, ids[0], ['fiscalyear_id', 'filter'], context=context) |
| 2041 | + if not obj['fiscalyear_id'] and obj['filter'] == 'filter_no': |
| 2042 | + return False |
| 2043 | + return True |
| 2044 | + |
| 2045 | + _constraints = [ |
| 2046 | + (_check_fiscalyear, 'When no Fiscal year is selected, you must choose to filter by periods or by date.', ['filter']), |
| 2047 | + ] |
| 2048 | + |
| 2049 | + def pre_print_report(self, cr, uid, ids, data, context=None): |
| 2050 | + data = super(AccountReportPrintJournalWizard, self).pre_print_report(cr, uid, ids, data, context) |
| 2051 | + # will be used to attach the report on the main account |
| 2052 | + data['ids'] = [data['form']['chart_account_id']] |
| 2053 | + vals = self.read(cr, uid, ids, |
| 2054 | + ['amount_currency', |
| 2055 | + 'display_account', |
| 2056 | + 'journal_ids'], |
| 2057 | + context=context)[0] |
| 2058 | + data['form'].update(vals) |
| 2059 | + return data |
| 2060 | + |
| 2061 | + def onchange_filter(self, cr, uid, ids, filter='filter_no', fiscalyear_id=False, context=None): |
| 2062 | + res = {} |
| 2063 | + if filter == 'filter_no': |
| 2064 | + res['value'] = {'period_from': False, 'period_to': False, 'date_from': False, 'date_to': False} |
| 2065 | + if filter == 'filter_date': |
| 2066 | + if fiscalyear_id: |
| 2067 | + fyear = self.pool.get('account.fiscalyear').browse(cr, uid, fiscalyear_id, context=context) |
| 2068 | + date_from = fyear.date_start |
| 2069 | + date_to = fyear.date_stop > time.strftime('%Y-%m-%d') and time.strftime('%Y-%m-%d') or fyear.date_stop |
| 2070 | + else: |
| 2071 | + date_from, date_to = time.strftime('%Y-01-01'), time.strftime('%Y-%m-%d') |
| 2072 | + res['value'] = {'period_from': False, 'period_to': False, 'date_from': date_from, 'date_to': date_to} |
| 2073 | + if filter == 'filter_period' and fiscalyear_id: |
| 2074 | + start_period = end_period = False |
| 2075 | + cr.execute(''' |
| 2076 | + SELECT * FROM (SELECT p.id |
| 2077 | + FROM account_period p |
| 2078 | + LEFT JOIN account_fiscalyear f ON (p.fiscalyear_id = f.id) |
| 2079 | + WHERE f.id = %s |
| 2080 | + AND COALESCE(p.special, FALSE) = FALSE |
| 2081 | + ORDER BY p.date_start ASC |
| 2082 | + LIMIT 1) AS period_start |
| 2083 | + UNION ALL |
| 2084 | + SELECT * FROM (SELECT p.id |
| 2085 | + FROM account_period p |
| 2086 | + LEFT JOIN account_fiscalyear f ON (p.fiscalyear_id = f.id) |
| 2087 | + WHERE f.id = %s |
| 2088 | + AND p.date_start < NOW() |
| 2089 | + AND COALESCE(p.special, FALSE) = FALSE |
| 2090 | + ORDER BY p.date_stop DESC |
| 2091 | + LIMIT 1) AS period_stop''', (fiscalyear_id, fiscalyear_id)) |
| 2092 | + periods = [i[0] for i in cr.fetchall()] |
| 2093 | + if periods: |
| 2094 | + start_period = end_period = periods[0] |
| 2095 | + if len(periods) > 1: |
| 2096 | + end_period = periods[1] |
| 2097 | + res['value'] = {'period_from': start_period, 'period_to': end_period, 'date_from': False, 'date_to': False} |
| 2098 | + return res |
| 2099 | + |
| 2100 | + def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): |
| 2101 | + ''' |
| 2102 | + used to set the domain on 'journal_ids' field: we exclude or only propose the journals of type |
| 2103 | + sale/purchase (+refund) accordingly to the presence of the key 'sale_purchase_only' in the context. |
| 2104 | + ''' |
| 2105 | + if context is None: |
| 2106 | + context = {} |
| 2107 | + res = super(AccountReportPrintJournalWizard, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu) |
| 2108 | + doc = etree.XML(res['arch']) |
| 2109 | + |
| 2110 | + if context.get('sale_purchase_only'): |
| 2111 | + domain = "[('type', 'in', ('sale','purchase','sale_refund','purchase_refund'))]" |
| 2112 | + else: |
| 2113 | + domain = "[('type', 'not in', ('sale','purchase','sale_refund','purchase_refund'))]" |
| 2114 | + nodes = doc.xpath("//field[@name='journal_ids']") |
| 2115 | + for node in nodes: |
| 2116 | + node.set('domain', domain) |
| 2117 | + res['arch'] = etree.tostring(doc) |
| 2118 | + return res |
| 2119 | + |
| 2120 | + def _print_report(self, cursor, uid, ids, data, context=None): |
| 2121 | + context = context or {} |
| 2122 | + # we update form with display account value |
| 2123 | + data = self.pre_print_report(cursor, uid, ids, data, context=context) |
| 2124 | + return {'type': 'ir.actions.report.xml', |
| 2125 | + 'report_name': 'account.account_report_print_journal_webkit', |
| 2126 | + 'datas': data} |
| 2127 | + |
| 2128 | +AccountReportPrintJournalWizard() |
| 2129 | + |
| 2130 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
| 2131 | |
| 2132 | === added file 'account_financial_report_webkit/wizard/print_journal_view.xml' |
| 2133 | --- account_financial_report_webkit/wizard/print_journal_view.xml 1970-01-01 00:00:00 +0000 |
| 2134 | +++ account_financial_report_webkit/wizard/print_journal_view.xml 2013-09-13 22:49:16 +0000 |
| 2135 | @@ -0,0 +1,101 @@ |
| 2136 | +<?xml version="1.0" encoding="UTF-8"?> |
| 2137 | +<openerp> |
| 2138 | + <data> |
| 2139 | + ############################################################################## |
| 2140 | + # |
| 2141 | + # account_financial_report_webkit module for OpenERP, Webkit based extended report financial report |
| 2142 | + # Copyright (C) 2012 SYLEAM Info Services ([http://www.syleam.fr/]) |
| 2143 | + # Sebastien LANGE [sebastien.lange@syleam.fr] |
| 2144 | + # |
| 2145 | + # This file is a part of account_financial_report_webkit |
| 2146 | + # |
| 2147 | + # account_financial_report_webkit is free software: you can redistribute it and/or modify |
| 2148 | + # it under the terms of the GNU Affero General Public License as published by |
| 2149 | + # the Free Software Foundation, either version 3 of the License, or |
| 2150 | + # (at your option) any later version. |
| 2151 | + # |
| 2152 | + # account_financial_report_webkit is distributed in the hope that it will be useful, |
| 2153 | + # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 2154 | + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 2155 | + # GNU Affero General Public License for more details. |
| 2156 | + # |
| 2157 | + # You should have received a copy of the GNU Affero General Public License |
| 2158 | + # along with this program. If not, see [http://www.gnu.org/licenses/]. |
| 2159 | + # |
| 2160 | + ############################################################################## |
| 2161 | + |
| 2162 | + <record id="account_report_print_journal_view_webkit" model="ir.ui.view"> |
| 2163 | + <field name="name">Journals</field> |
| 2164 | + <field name="model">print.journal.webkit</field> |
| 2165 | + <field name="type">form</field> |
| 2166 | + <field name="inherit_id" ref="account.account_common_report_view"/> |
| 2167 | + <field name="arch" type="xml"> |
| 2168 | + <data> |
| 2169 | + <xpath expr="/form/label[@string='']" position="replace"> |
| 2170 | + <separator string="Journals" colspan="4"/> |
| 2171 | + <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your print journal with details of all your account journals"/> |
| 2172 | + </xpath> |
| 2173 | + <xpath expr="//field[@name='target_move']" position="after"> |
| 2174 | + <field name="amount_currency"/> |
| 2175 | + <newline/> |
| 2176 | + <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)" colspan="4" invisible="1"/> |
| 2177 | + <separator string="Periods" colspan="4"/> |
| 2178 | + <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]" required="1" colspan="4"/> |
| 2179 | + <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" required="1" colspan="4"/> |
| 2180 | + <separator string="Journals" colspan="4"/> |
| 2181 | + <field name="journal_ids" colspan="4" nolabel="1"/> |
| 2182 | + </xpath> |
| 2183 | + <xpath expr="//page[@name='filters']" position="replace"> |
| 2184 | + </xpath> |
| 2185 | + <xpath expr="//page[@name='journal_ids']" position="replace"> |
| 2186 | + </xpath> |
| 2187 | + </data> |
| 2188 | + </field> |
| 2189 | + </record> |
| 2190 | + |
| 2191 | + <record id="account_report_print_journal_view_inherit" model="ir.ui.view"> |
| 2192 | + <field name="name">Journals</field> |
| 2193 | + <field name="model">print.journal.webkit</field> |
| 2194 | + <field name="type">form</field> |
| 2195 | + <field name="inherit_id" ref="account.account_report_print_journal"/> |
| 2196 | + <field name="arch" type="xml"> |
| 2197 | + <field name="fiscalyear_id" position="replace"> |
| 2198 | + <field name="fiscalyear_id" on_change="onchange_fiscalyear(fiscalyear_id)"/> |
| 2199 | + </field> |
| 2200 | + </field> |
| 2201 | + </record> |
| 2202 | + |
| 2203 | + <record id="action_account_print_journal_menu_webkit" model="ir.actions.act_window"> |
| 2204 | + <field name="name">Journals</field> |
| 2205 | + <field name="type">ir.actions.act_window</field> |
| 2206 | + <field name="res_model">print.journal.webkit</field> |
| 2207 | + <field name="view_type">form</field> |
| 2208 | + <field name="view_mode">form</field> |
| 2209 | + <field name="view_id" ref="account_report_print_journal_view_webkit"/> |
| 2210 | + <field name="target">new</field> |
| 2211 | + </record> |
| 2212 | + |
| 2213 | + <record model="ir.values" id="action_account_print_journal_values_webkit"> |
| 2214 | + <field name="model_id" ref="account.model_account_account"/> |
| 2215 | + <field name="object" eval="1"/> |
| 2216 | + <field name="name">Journals</field> |
| 2217 | + <field name="key2">client_print_multi</field> |
| 2218 | + <field name="value" |
| 2219 | + eval="'ir.actions.act_window,' +str(ref('action_account_print_journal_menu_webkit'))"/> |
| 2220 | + <field name="key">action</field> |
| 2221 | + <field name="model">account.journal.period</field> |
| 2222 | + </record> |
| 2223 | + |
| 2224 | + <record id="action_account_print_journal_sale_purchase_menu_webkit" model="ir.actions.act_window"> |
| 2225 | + <field name="name">Journals</field> |
| 2226 | + <field name="type">ir.actions.act_window</field> |
| 2227 | + <field name="res_model">print.journal.webkit</field> |
| 2228 | + <field name="view_type">form</field> |
| 2229 | + <field name="view_mode">form</field> |
| 2230 | + <field name="view_id" ref="account_report_print_journal_view_webkit"/> |
| 2231 | + <field name="context">{'sale_purchase_only':True}</field> |
| 2232 | + <field name="target">new</field> |
| 2233 | + </record> |
| 2234 | + |
| 2235 | + </data> |
| 2236 | +</openerp> |
layout + multi-company, multicurrency test OK.
Just Perfect... :)
Many thanks Sebastien