From 3bfcd93b60a99603183d827b3f03fa3aae4bdbca Mon Sep 17 00:00:00 2001 From: Bogdan Stanciu Date: Mon, 7 Feb 2011 08:59:53 +0100 Subject: [PATCH 001/116] [FIX] translation issuer for legal reports. the fr.po file should be done via rosetta maybe, but... lp bug: https://launchpad.net/bugs/714427 fixed bzr revid: bogdanovidiu.stanciu@gmail.com-20110207075953-9qtb25i635xhi6de --- addons/account/i18n/account.pot | 184 +++++++++++++++++++++++++---- addons/account/i18n/fr.po | 198 ++++++++++++++++++++++++++++---- 2 files changed, 333 insertions(+), 49 deletions(-) diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index d8dbcb92c58..4fbd96244ae 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -451,8 +451,6 @@ msgstr "" #: field:account.move.bank.reconcile,journal_id:0 #: view:account.move.line:0 #: field:account.move.line,journal_id:0 -#: report:account.third_party_ledger:0 -#: report:account.third_party_ledger_other:0 #: code:addons/account/account_move_line.py:983 #: view:analytic.entries.report:0 #: field:analytic.entries.report,journal_id:0 @@ -1078,6 +1076,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 @@ -1265,6 +1264,16 @@ msgstr "" #: selection:account.partner.balance,display_partner:0 #: selection:account.pl.report,display_account:0 #: selection:account.report.general.ledger,display_account:0 +#: report:account.account.balance:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "With balance is not equal to 0" msgstr "" @@ -1987,6 +1996,9 @@ msgstr "" #. module: account #: report:account.journal.period.print:0 #: field:account.print.journal,sort_selection:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 + msgid "Entries Sorted By" msgstr "" @@ -2008,11 +2020,16 @@ msgstr "" #. module: account #: report:account.account.balance:0 #: report:account.central.journal:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 #: view:account.entries.report:0 #: field:account.entries.report,fiscalyear_id:0 #: field:account.fiscalyear,name:0 #: report:account.general.journal:0 -#: report:account.general.ledger:0 #: field:account.journal.period,fiscalyear_id:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -2312,6 +2329,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.overdue:0 #: report:account.third_party_ledger:0 @@ -2543,6 +2561,8 @@ msgstr "" #. module: account #: view:account.pl.report:0 #: model:ir.ui.menu,name:account.menu_account_pl_report +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Profit And Loss" msgstr "" @@ -2786,7 +2806,6 @@ msgstr "" #: report:account.general.journal:0 #: field:account.general.journal,journal_ids:0 #: view:account.journal.period:0 -#: report:account.partner.balance:0 #: field:account.partner.balance,journal_ids:0 #: field:account.partner.ledger,journal_ids:0 #: field:account.pl.report,journal_ids:0 @@ -2800,6 +2819,17 @@ msgstr "" #: model:ir.ui.menu,name:account.menu_action_account_journal_form #: model:ir.ui.menu,name:account.menu_journals #: model:ir.ui.menu,name:account.menu_journals_report +#: report:account.account.balance:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.central.journal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Journals" msgstr "" @@ -3001,6 +3031,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 msgid "Counterpart" msgstr "" @@ -3477,11 +3508,10 @@ msgid "Analytic Balance" msgstr "" #. module: account -#: code:addons/account/report/account_balance_sheet.py:76 -#: code:addons/account/report/account_balance_sheet.py:122 -#: code:addons/account/report/account_profit_loss.py:76 -#: code:addons/account/report/account_profit_loss.py:124 -#, python-format +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Net Loss" msgstr "" @@ -4273,7 +4303,6 @@ msgid "Analytic Balance -" msgstr "" #. module: account -#: report:account.account.balance:0 #: field:account.aged.trial.balance,target_move:0 #: field:account.balance.report,target_move:0 #: field:account.bs.report,target_move:0 @@ -4286,10 +4315,8 @@ msgstr "" #: field:account.common.report,target_move:0 #: report:account.general.journal:0 #: field:account.general.journal,target_move:0 -#: report:account.general.ledger:0 #: report:account.journal.period.print:0 #: field:account.move.journal,target_move:0 -#: report:account.partner.balance:0 #: field:account.partner.balance,target_move:0 #: field:account.partner.ledger,target_move:0 #: field:account.pl.report,target_move:0 @@ -4299,6 +4326,16 @@ msgstr "" #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 #: field:account.vat.declaration,target_move:0 +#: report:account.account.balance:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Target Moves" msgstr "" @@ -4414,6 +4451,8 @@ msgstr "" #: view:account.bs.report:0 #: model:ir.actions.act_window,name:account.action_account_bs_report #: model:ir.ui.menu,name:account.menu_account_bs_report +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 msgid "Balance Sheet" msgstr "" @@ -5087,6 +5126,19 @@ msgstr "" #. module: account #: code:addons/account/report/common_report_header.py:100 #, python-format +#: report:account.account.balance:0 +#: report:account.central.journal:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.journal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 +#: report:account.vat.declaration:0 msgid "No Filter" msgstr "" @@ -5944,6 +5996,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: view:account.report.general.ledger:0 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu #: model:ir.actions.report.xml,name:account.account_general_ledger @@ -6762,6 +6815,7 @@ msgstr "" #: view:account.entries.report:0 #: field:account.entries.report,partner_id:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: view:account.invoice:0 #: field:account.invoice,partner_id:0 #: field:account.invoice.line,partner_id:0 @@ -7003,6 +7057,19 @@ msgstr "" #: field:account.tax.chart,period_id:0 #: code:addons/account/account_move_line.py:982 #: field:validate.account.move,period_id:0 +#: report:account.account.balance:0 +#: report:account.central.journal:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.journal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 +#: report:account.vat.declaration:0 #, python-format msgid "Period" msgstr "" @@ -7074,11 +7141,17 @@ msgid "Company Currency" msgstr "" #. module: account -#: report:account.general.ledger:0 +#: report:account.account.balance:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 -msgid "Chart of Account" +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 +msgid "Chart of Accounts" msgstr "" #. module: account @@ -7187,6 +7260,12 @@ msgstr "" #: report:account.central.journal:0 #: report:account.general.journal:0 #: report:account.partner.balance:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Filter By" msgstr "" @@ -7411,6 +7490,7 @@ msgstr "" #: field:account.entries.report,currency_id:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.invoice,currency_id:0 #: field:account.invoice.report,currency_id:0 #: field:account.journal,currency:0 @@ -7664,12 +7744,17 @@ msgstr "" #: report:account.account.balance:0 #: report:account.central.journal:0 #: report:account.general.journal:0 -#: report:account.general.ledger:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 #: report:account.vat.declaration:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Start Period" msgstr "" @@ -7781,7 +7866,12 @@ msgstr "" #: report:account.central.journal:0 #: field:account.entries.report,balance:0 #: report:account.general.journal:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 #: field:account.move.line,balance:0 #: report:account.partner.balance:0 #: selection:account.payment.term.line,value:0 @@ -7800,6 +7890,15 @@ msgstr "" #. module: account #: report:account.account.balance:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Display Account" msgstr "" @@ -7997,12 +8096,17 @@ msgstr "" #: report:account.account.balance:0 #: report:account.central.journal:0 #: report:account.general.journal:0 -#: report:account.general.ledger:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 #: report:account.vat.declaration:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "End Period" msgstr "" @@ -8192,6 +8296,7 @@ msgstr "" #: field:account.entries.report,credit:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.model.line,credit:0 #: field:account.move.line,credit:0 @@ -8268,6 +8373,18 @@ msgstr "" #: selection:account.pl.report,filter:0 #: selection:account.print.journal,filter:0 #: selection:account.report.general.ledger,filter:0 +#: report:account.account.balance:0 +#: report:account.central.journal:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.journal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 #: report:account.vat.declaration:0 #: view:account.vat.declaration:0 #: selection:account.vat.declaration,filter:0 @@ -8469,13 +8586,10 @@ msgid "Tax Source" msgstr "" #. module: account -#: code:addons/account/report/account_balance_sheet.py:71 -#: code:addons/account/report/account_balance_sheet.py:116 -#: code:addons/account/report/account_balance_sheet.py:119 -#: code:addons/account/report/account_balance_sheet.py:120 -#: code:addons/account/report/account_profit_loss.py:71 -#: code:addons/account/report/account_profit_loss.py:127 -#, python-format +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Net Profit" msgstr "" @@ -8499,7 +8613,7 @@ msgstr "" #: report:account.general.ledger:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 -msgid "JNRL" +msgid "JRNL" msgstr "" #. module: account @@ -8701,6 +8815,7 @@ msgstr "" #: field:account.entries.report,debit:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.model.line,debit:0 #: field:account.move.line,debit:0 @@ -8770,6 +8885,16 @@ msgstr "" #: selection:account.common.account.report,display_account:0 #: selection:account.pl.report,display_account:0 #: selection:account.report.general.ledger,display_account:0 +#: report:account.account.balance:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "With movements" msgstr "" @@ -9121,3 +9246,14 @@ msgstr "" msgid "The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)." msgstr "" +#. module: account +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +msgid "Assets" +msgstr "" + +#. module: account +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +msgid "Liabilities" +msgstr "" \ No newline at end of file diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po index 0b233ef483c..61c368e82a5 100644 --- a/addons/account/i18n/fr.po +++ b/addons/account/i18n/fr.po @@ -1439,6 +1439,16 @@ msgstr "Vous ne pouvez pas utiliser ce compte général dans ce journal !" #: selection:account.partner.balance,display_partner:0 #: selection:account.pl.report,display_account:0 #: selection:account.report.general.ledger,display_account:0 +#: report:account.account.balance:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "With balance is not equal to 0" msgstr "Avec la balance qui n'est pas égale à 0" @@ -2255,6 +2265,8 @@ msgstr "Propriétés des comptes" #. module: account #: report:account.journal.period.print:0 #: field:account.print.journal,sort_selection:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 msgid "Entries Sorted By" msgstr "Écritures triées par" @@ -2276,11 +2288,16 @@ msgstr "Modèle de produit" #. module: account #: report:account.account.balance:0 #: report:account.central.journal:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 #: view:account.entries.report:0 #: field:account.entries.report,fiscalyear_id:0 #: field:account.fiscalyear,name:0 #: report:account.general.journal:0 -#: report:account.general.ledger:0 #: field:account.journal.period,fiscalyear_id:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -2620,6 +2637,7 @@ msgstr "Rem.(%)" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.overdue:0 #: report:account.third_party_ledger:0 @@ -2882,8 +2900,10 @@ msgstr "Comptabilité financière" #. module: account #: view:account.pl.report:0 #: model:ir.ui.menu,name:account.menu_account_pl_report +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Profit And Loss" -msgstr "Pertes et profits" +msgstr "Compte de résultat" #. module: account #: view:account.fiscal.position:0 @@ -3156,7 +3176,6 @@ msgstr "Laisser vide pour utiliser le compte de dépense" #: report:account.general.journal:0 #: field:account.general.journal,journal_ids:0 #: view:account.journal.period:0 -#: report:account.partner.balance:0 #: field:account.partner.balance,journal_ids:0 #: field:account.partner.ledger,journal_ids:0 #: field:account.pl.report,journal_ids:0 @@ -3170,6 +3189,17 @@ msgstr "Laisser vide pour utiliser le compte de dépense" #: model:ir.ui.menu,name:account.menu_action_account_journal_form #: model:ir.ui.menu,name:account.menu_journals #: model:ir.ui.menu,name:account.menu_journals_report +#: report:account.account.balance:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.central.journal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Journals" msgstr "Journaux" @@ -3389,6 +3419,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 msgid "Counterpart" msgstr "Contrepartie" @@ -3907,11 +3938,10 @@ msgid "Analytic Balance" msgstr "Balance analytique" #. module: account -#: code:addons/account/report/account_balance_sheet.py:76 -#: code:addons/account/report/account_balance_sheet.py:122 -#: code:addons/account/report/account_profit_loss.py:76 -#: code:addons/account/report/account_profit_loss.py:124 -#, python-format +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Net Loss" msgstr "Perte nette" @@ -4770,7 +4800,6 @@ msgid "Analytic Balance -" msgstr "Balance Analytique -" #. module: account -#: report:account.account.balance:0 #: field:account.aged.trial.balance,target_move:0 #: field:account.balance.report,target_move:0 #: field:account.bs.report,target_move:0 @@ -4783,10 +4812,8 @@ msgstr "Balance Analytique -" #: field:account.common.report,target_move:0 #: report:account.general.journal:0 #: field:account.general.journal,target_move:0 -#: report:account.general.ledger:0 #: report:account.journal.period.print:0 #: field:account.move.journal,target_move:0 -#: report:account.partner.balance:0 #: field:account.partner.balance,target_move:0 #: field:account.partner.ledger,target_move:0 #: field:account.pl.report,target_move:0 @@ -4796,6 +4823,16 @@ msgstr "Balance Analytique -" #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 #: field:account.vat.declaration,target_move:0 +#: report:account.account.balance:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Target Moves" msgstr "Mouvements Cibles" @@ -4912,6 +4949,8 @@ msgstr "Résultat du lettrage" #: view:account.bs.report:0 #: model:ir.actions.act_window,name:account.action_account_bs_report #: model:ir.ui.menu,name:account.menu_account_bs_report +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 msgid "Balance Sheet" msgstr "Bilan" @@ -5628,6 +5667,16 @@ msgstr "La nouvelle devise n'est pas correctement paramétrée !" #: field:account.print.journal,filter:0 #: field:account.report.general.ledger,filter:0 #: field:account.vat.declaration,filter:0 +#: field:account.account.balance,filter:0 +#: field:account.central.journal,filter:0 +#: field:account.general.journal,filter:0 +#: field:account.partner.balance,filter:0 +#: field:account.balancesheet,filter:0 +#: field:account.balancesheet.horizontal,filter:0 +#: field:account.general.ledger,filter:0 +#: field:account.general.ledger_landscape,filter:0 +#: field:pl.account,filter:0 +#: field:pl.account.horizontal,filter:0 msgid "Filter by" msgstr "Filtrer par" @@ -5659,6 +5708,19 @@ msgstr "Journal général de comptabilité" #. module: account #: code:addons/account/report/common_report_header.py:100 #, python-format +#: report:account.account.balance:0 +#: report:account.central.journal:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.journal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 +#: report:account.vat.declaration:0 msgid "No Filter" msgstr "Pas de filtre" @@ -6625,6 +6687,7 @@ msgstr "Régime fiscal de taxes" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: view:account.report.general.ledger:0 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu #: model:ir.actions.report.xml,name:account.account_general_ledger @@ -7639,6 +7702,7 @@ msgstr "Montant (en toutes lettres) :" #: view:account.entries.report:0 #: field:account.entries.report,partner_id:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: view:account.invoice:0 #: field:account.invoice,partner_id:0 #: field:account.invoice.line,partner_id:0 @@ -7904,6 +7968,19 @@ msgstr "Gestion de la comptabilité et des finances" #: field:account.tax.chart,period_id:0 #: code:addons/account/account_move_line.py:982 #: field:validate.account.move,period_id:0 +#: report:account.account.balance:0 +#: report:account.central.journal:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.journal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 +#: report:account.vat.declaration:0 #, python-format msgid "Period" msgstr "Période" @@ -8000,11 +8077,17 @@ msgid "Company Currency" msgstr "Devise société" #. module: account -#: report:account.general.ledger:0 +#: report:account.account.balance:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 -msgid "Chart of Account" +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 +msgid "Chart of Accounts" msgstr "Plan comptable" #. module: account @@ -8124,6 +8207,12 @@ msgstr "Journal d'avoirs" #: report:account.central.journal:0 #: report:account.general.journal:0 #: report:account.partner.balance:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Filter By" msgstr "Filtré par" @@ -8377,6 +8466,7 @@ msgstr "" #: field:account.entries.report,currency_id:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.invoice,currency_id:0 #: field:account.invoice.report,currency_id:0 #: field:account.journal,currency:0 @@ -8692,14 +8782,19 @@ msgstr "Gestion des suivis" #: report:account.account.balance:0 #: report:account.central.journal:0 #: report:account.general.journal:0 -#: report:account.general.ledger:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 #: report:account.vat.declaration:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Start Period" -msgstr "Démarrer la période" +msgstr "Période de début" #. module: account #: code:addons/account/account.py:2333 @@ -8825,7 +8920,12 @@ msgstr "Laisser vide pour utiliser le compte de revenu" #: report:account.central.journal:0 #: field:account.entries.report,balance:0 #: report:account.general.journal:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 #: field:account.move.line,balance:0 #: report:account.partner.balance:0 #: selection:account.payment.term.line,value:0 @@ -8835,7 +8935,7 @@ msgstr "Laisser vide pour utiliser le compte de revenu" #: field:report.account.receivable,balance:0 #: field:report.aged.receivable,balance:0 msgid "Balance" -msgstr "Solde de la balance" +msgstr "Balance" #. module: account #: model:process.node,note:account.process_node_supplierbankstatement0 @@ -8844,6 +8944,15 @@ msgstr "Saisi manuellement ou automatiquement dans le système" #. module: account #: report:account.account.balance:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Display Account" msgstr "Afficher le compte" @@ -8975,6 +9084,7 @@ msgstr "Saisie manuelle" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.move.line,move_id:0 #: field:analytic.entries.report,move_id:0 @@ -9071,14 +9181,19 @@ msgstr "Solde analytique" #: report:account.account.balance:0 #: report:account.central.journal:0 #: report:account.general.journal:0 -#: report:account.general.ledger:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 #: report:account.vat.declaration:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "End Period" -msgstr "Fin de période" +msgstr "Période de fin" #. module: account #: field:account.aged.trial.balance,chart_account_id:0 @@ -9294,6 +9409,7 @@ msgstr "Valider les mouvements de compte" #: field:account.entries.report,credit:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.model.line,credit:0 #: field:account.move.line,credit:0 @@ -9381,6 +9497,18 @@ msgstr "Général" #: selection:account.pl.report,filter:0 #: selection:account.print.journal,filter:0 #: selection:account.report.general.ledger,filter:0 +#: report:account.account.balance:0 +#: report:account.central.journal:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.journal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 #: report:account.vat.declaration:0 #: view:account.vat.declaration:0 #: selection:account.vat.declaration,filter:0 @@ -9599,13 +9727,10 @@ msgid "Tax Source" msgstr "Base de la taxe" #. module: account -#: code:addons/account/report/account_balance_sheet.py:71 -#: code:addons/account/report/account_balance_sheet.py:116 -#: code:addons/account/report/account_balance_sheet.py:119 -#: code:addons/account/report/account_balance_sheet.py:120 -#: code:addons/account/report/account_profit_loss.py:71 -#: code:addons/account/report/account_profit_loss.py:127 -#, python-format +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Net Profit" msgstr "Profit net" @@ -9845,6 +9970,7 @@ msgstr "Facture fournisseur" #: field:account.entries.report,debit:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.model.line,debit:0 #: field:account.move.line,debit:0 @@ -9924,6 +10050,16 @@ msgstr "" #: selection:account.common.account.report,display_account:0 #: selection:account.pl.report,display_account:0 #: selection:account.report.general.ledger,display_account:0 +#: report:account.account.balance:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "With movements" msgstr "avec mouvements" @@ -10315,6 +10451,18 @@ msgstr "" "exprimée dans la devise du journal (si elle est différente de la devise de " "la société)" +#. module: account +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +msgid "Assets" +msgstr "Actif" + +#. module: account +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +msgid "Liabilities" +msgstr "Passif" + #~ msgid "Keep empty to use the period of the validation date." #~ msgstr "Laissez vide pour utiliser la période de la date de validation" From 0886e43811bf581a47b2f2c91150ed6409ea8fa5 Mon Sep 17 00:00:00 2001 From: Bogdan Stanciu Date: Mon, 7 Feb 2011 10:06:40 +0100 Subject: [PATCH 002/116] [FIX] legal reports and other reports - data rendering, formatting, translation lp bug: https://launchpad.net/bugs/714427 fixed bzr revid: bogdanovidiu.stanciu@gmail.com-20110207090640-vdy8jybisrjn698d --- .../report/account_aged_partner_balance.rml | 2 +- addons/account/report/account_balance.rml | 2 +- .../account/report/account_balance_sheet.rml | 4 +-- .../account_balance_sheet_horizontal.rml | 36 ++++++++++++------- .../report/account_central_journal.rml | 3 +- .../report/account_general_journal.rml | 2 +- .../account/report/account_general_ledger.rml | 14 ++++---- .../account_general_ledger_landscape.rml | 2 +- addons/account/report/account_journal.rml | 2 +- .../report/account_partner_balance.rml | 2 +- .../account/report/account_partner_ledger.rml | 12 +++---- .../report/account_partner_ledger_other.rml | 12 +++---- .../report/account_profit_horizontal.rml | 10 +++--- addons/account/report/account_profit_loss.rml | 2 +- addons/account/report/common_report_header.py | 6 ++-- 15 files changed, 61 insertions(+), 50 deletions(-) diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml index c76aba31763..ace66af0584 100644 --- a/addons/account/report/account_aged_partner_balance.rml +++ b/addons/account/report/account_aged_partner_balance.rml @@ -112,7 +112,7 @@ - Chart of Account + Chart of Accounts Fiscal Year diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index 7c9aa13da2e..5f67ea9933a 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -212,7 +212,7 @@ [[ data['model']=='account.account' and 'Company'or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] + [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]] Fiscal Year diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml index 680c7d4bb43..7ad5a4d72f6 100644 --- a/addons/account/report/account_balance_sheet.rml +++ b/addons/account/report/account_balance_sheet.rml @@ -143,9 +143,9 @@ - Chart of Account + Chart of Accounts Fiscal Year - Filter By [[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]] + Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Display Account Target Moves diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml index f9942c41b95..5f11638f04c 100644 --- a/addons/account/report/account_balance_sheet_horizontal.rml +++ b/addons/account/report/account_balance_sheet_horizontal.rml @@ -132,7 +132,7 @@ - Chart of Account + Chart of Accounts Fiscal Year Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Display Account @@ -196,28 +196,40 @@ - [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['code1'] ]] + + [[ repeatIn(get_lines(),'a' ) ]] [[ a['code1'] ]][[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] + - [[ '. '*(a['level1']-1) ]][[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]] + + [[ '. '*(a['level1']-1) ]][[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]] + - [[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]] + + [[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]] + - [[ repeatIn(get_lines(), 'a') ]] [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['code'] ]][[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]] + + [[ a['code'] ]][[ ( a['level']<4 or a['name']=='Net Profit') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] + - [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]][[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]] + + [[ '. '*(a['level']-1) ]] + [[ (a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) and a['name']!='Net Profit') or removeParentNode('font') ]][[ a['name'] ]] + - [[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]] -[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]] - [[(a['code'] and a['name']) and formatLang(abs(a['balance'])) or removeParentNode('font')]] [[ company.currency_id.symbol ]] + + [[ ( a['level']<4 or a['name']=='Net Profit') and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]] + [[(a['code'] and a['name']) and formatLang(abs(a['balance'])) or removeParentNode('font')]] [[ company.currency_id.symbol ]] + - - - + + + Balance: diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml index 33566083652..fe064132cbc 100644 --- a/addons/account/report/account_central_journal.rml +++ b/addons/account/report/account_central_journal.rml @@ -235,8 +235,7 @@ - [[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] + Chart of Accounts Fiscal Year Journal Filter By [[get_filter(data)!='No Filter' and get_filter(data) ]] diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml index f4cc13069c8..6424a24f8aa 100644 --- a/addons/account/report/account_general_journal.rml +++ b/addons/account/report/account_general_journal.rml @@ -221,7 +221,7 @@ [[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] + [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]] Fiscal Year Journals Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml index 15614444822..7a8454d714a 100644 --- a/addons/account/report/account_general_ledger.rml +++ b/addons/account/report/account_general_ledger.rml @@ -270,7 +270,7 @@ Date - JNRL + JRNL Partner @@ -304,7 +304,7 @@ Date - JNRL + JRNL Partner @@ -344,16 +344,16 @@ - Chart of Account + Chart of Accounts Fiscal Year - Journal + Journals - Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Target Moves @@ -431,7 +431,7 @@ Date - JNRL + JRNL Partner @@ -530,7 +530,7 @@ Date - JNRL + JRNL Partner diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index 22712af0f8c..5ba7e2f47d4 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -361,7 +361,7 @@ [[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] + [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]] Fiscal Year diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index 9b0ac55bb56..3825eb58d76 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -186,7 +186,7 @@ [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] + [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]] Fiscal Year Journal Filters By diff --git a/addons/account/report/account_partner_balance.rml b/addons/account/report/account_partner_balance.rml index 6425d6a4db6..baf43435a44 100644 --- a/addons/account/report/account_partner_balance.rml +++ b/addons/account/report/account_partner_balance.rml @@ -184,7 +184,7 @@ - Chart of Account + Chart of Accounts Fiscal Year Journals Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml index 69faa977da1..11385b34d71 100644 --- a/addons/account/report/account_partner_ledger.rml +++ b/addons/account/report/account_partner_ledger.rml @@ -280,7 +280,7 @@ Date - JNRL + JRNL Ref @@ -308,7 +308,7 @@ Date - JNRL + JRNL Ref @@ -346,13 +346,13 @@ - Chart of Account + Chart of Accounts Fiscal Year - Journal + Journals Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] @@ -443,7 +443,7 @@ Date - JNRL + JRNL Ref @@ -544,7 +544,7 @@ Date - JNRL + JRNL Ref diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml index 22942e15c78..cac5cca0ed6 100644 --- a/addons/account/report/account_partner_ledger_other.rml +++ b/addons/account/report/account_partner_ledger_other.rml @@ -281,7 +281,7 @@ Date - JNRL + JRNL Ref @@ -310,7 +310,7 @@ Date - JNRL + JRNL Ref @@ -347,13 +347,13 @@ - Chart of Account + Chart of Accounts Fiscal Year - Journal + Journals Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] @@ -441,7 +441,7 @@ Date - JNRL + JRNL Ref @@ -546,7 +546,7 @@ Date - JNRL + JRNL Ref diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml index ca444bb4eca..86f0728eb4e 100644 --- a/addons/account/report/account_profit_horizontal.rml +++ b/addons/account/report/account_profit_horizontal.rml @@ -149,7 +149,7 @@ [[ get_data(data) or removeParentNode('para')]] - Chart of Account + Chart of Accounts Fiscal Year Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Display Account @@ -193,7 +193,7 @@ Code - Particular + Expenses Balance @@ -202,7 +202,7 @@ Code - Particular + Income Balance @@ -212,7 +212,7 @@ - [[ repeatIn(get_lines(),'a' ) ]] [[ a['code'] ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] + [[ repeatIn(get_lines(),'a' ) ]] [[ a['code'] ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] @@ -234,7 +234,7 @@ - [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[(a['code1'] and a['name1']) and formatLang(abs(a['balance1'])) or removeParentNode('font') ]] [[ company.currency_id.symbol ]] + [[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[(a['code1'] and a['name1']) and formatLang(abs(a['balance1'])) or removeParentNode('font') ]] [[ company.currency_id.symbol ]] diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml index 582885d89dc..f10a5b46783 100644 --- a/addons/account/report/account_profit_loss.rml +++ b/addons/account/report/account_profit_loss.rml @@ -153,7 +153,7 @@ - Chart of Account + Chart of Accounts Fiscal Year Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Display Account diff --git a/addons/account/report/common_report_header.py b/addons/account/report/common_report_header.py index 48e26e839d3..5769248405f 100644 --- a/addons/account/report/common_report_header.py +++ b/addons/account/report/common_report_header.py @@ -94,10 +94,10 @@ class common_report_header(object): def _get_filter(self, data): if data.get('form', False) and data['form'].get('filter', False): if data['form']['filter'] == 'filter_date': - return _('Date') + return 'Date' elif data['form']['filter'] == 'filter_period': - return _('Periods') - return _('No Filter') + return 'Periods' + return 'No Filter' def _sum_debit_period(self, period_id, journal_id=None): journals = journal_id or self.journal_ids From 0f566832f9d4d503cf2e698995a1b2903d4a720c Mon Sep 17 00:00:00 2001 From: Olivier Ligot Date: Mon, 14 Feb 2011 16:19:36 +0100 Subject: [PATCH 003/116] [FIX] Add priority on view_base_synchro as there are 2 form views on object base.synchro Without the priority, the wrong form view (view_base_synchro_finish) is displayed bzr revid: olivier.ligot@groupes.be-20110214151936-xs6w6jxu41es1715 --- addons/base_synchro/wizard/base_synchro_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/base_synchro/wizard/base_synchro_view.xml b/addons/base_synchro/wizard/base_synchro_view.xml index c0c140f3791..e37a82914b4 100644 --- a/addons/base_synchro/wizard/base_synchro_view.xml +++ b/addons/base_synchro/wizard/base_synchro_view.xml @@ -7,6 +7,7 @@ Base Synchronization base.synchro form + 1
From 6ddddf02dc504247a7cd1dacc838c834c4c62d4c Mon Sep 17 00:00:00 2001 From: Olivier Ligot Date: Mon, 14 Feb 2011 16:19:57 +0100 Subject: [PATCH 004/116] [FIX] remove context argument when calling methods on pool_src bzr revid: olivier.ligot@groupes.be-20110214151957-8889z2ky3zlaegir --- addons/base_synchro/wizard/base_synchro.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/base_synchro/wizard/base_synchro.py b/addons/base_synchro/wizard/base_synchro.py index d3c1de40d6d..32273c38bee 100644 --- a/addons/base_synchro/wizard/base_synchro.py +++ b/addons/base_synchro/wizard/base_synchro.py @@ -165,7 +165,7 @@ class base_synchro(osv.osv_memory): # # If not synchronized, try to find it with name_get/name_search # - names = pool_src.get(object).name_get(cr, uid, [id], context)[0][1] + names = pool_src.get(object).name_get(cr, uid, [id])[0][1] res = pool_dest.get(object).name_search(cr, uid, names, [], 'like') if res: result = res[0][0] @@ -184,7 +184,7 @@ class base_synchro(osv.osv_memory): def data_transform(self, cr, uid, pool_src, pool_dest, object, data, action='u', context=None): self.meta.setdefault(pool_src, {}) if not object in self.meta[pool_src]: - self.meta[pool_src][object] = pool_src.get(object).fields_get(cr, uid, context=context) + self.meta[pool_src][object] = pool_src.get(object).fields_get(cr, uid) fields = self.meta[pool_src][object] for f in fields: From fbfa318e86e3d8b820128992d9cdf5c9425005e6 Mon Sep 17 00:00:00 2001 From: Olivier Ligot Date: Mon, 14 Feb 2011 16:20:20 +0100 Subject: [PATCH 005/116] [FIX] Use of syn_obj.user_id bzr revid: olivier.ligot@groupes.be-20110214152020-1w5wwxb1vawyo2h5 --- addons/base_synchro/wizard/base_synchro.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/base_synchro/wizard/base_synchro.py b/addons/base_synchro/wizard/base_synchro.py index 32273c38bee..265b5049209 100644 --- a/addons/base_synchro/wizard/base_synchro.py +++ b/addons/base_synchro/wizard/base_synchro.py @@ -225,7 +225,7 @@ class base_synchro(osv.osv_memory): dt = time.strftime('%Y-%m-%d %H:%M:%S') self.pool.get('base.synchro.obj').write(cr, uid, [object.id], {'synchronize_date': dt}) end_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss') - if 'user_id' in syn_obj.user_id: + if syn_obj.user_id: request = pooler.get_pool(cr.dbname).get('res.request') if not self.report: self.report.append('No exception.') @@ -244,7 +244,7 @@ Exceptions: request.create(cr, uid, { 'name' : "Synchronization report", 'act_from' : uid, - 'act_to' : syn_obj.user_id, + 'act_to' : syn_obj.user_id.id, 'body': summary, }) return True From 8694b9060961db4bfc07dccd11a695dd16686f90 Mon Sep 17 00:00:00 2001 From: Olivier Ligot Date: Mon, 14 Feb 2011 16:20:36 +0100 Subject: [PATCH 006/116] [FIX] Pass wrong id when calling browse on object base.synchro.server bzr revid: olivier.ligot@groupes.be-20110214152036-54fezsfxhjnuubsj --- addons/base_synchro/wizard/base_synchro.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_synchro/wizard/base_synchro.py b/addons/base_synchro/wizard/base_synchro.py index 265b5049209..45f020349de 100644 --- a/addons/base_synchro/wizard/base_synchro.py +++ b/addons/base_synchro/wizard/base_synchro.py @@ -216,7 +216,7 @@ class base_synchro(osv.osv_memory): start_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss') syn_obj = self.browse(cr, uid, ids, context=context)[0] pool = pooler.get_pool(cr.dbname) - server = pool.get('base.synchro.server').browse(cr, uid, ids, context=context)[0] + server = pool.get('base.synchro.server').browse(cr, uid, syn_obj.server_url.id, context=context) for object in server.obj_ids: dt = time.strftime('%Y-%m-%d %H:%M:%S') self.synchronize(cr, uid, server, object, context) From 7675254982427108fd3e70bd2306b36c58660f11 Mon Sep 17 00:00:00 2001 From: Quentin THEURET Date: Fri, 25 Feb 2011 16:04:03 +0100 Subject: [PATCH 007/116] [FIX] Duplicated menus entries -- Call the good view on 'Synchronized object' wizard lp bug: https://launchpad.net/bugs/725033 fixed bzr revid: quentin@tempo-quentin-20110225150403-tsxsukf1wvmhkoam --- addons/base_synchro/wizard/base_synchro_view.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/base_synchro/wizard/base_synchro_view.xml b/addons/base_synchro/wizard/base_synchro_view.xml index c0c140f3791..e4ffc8e323c 100644 --- a/addons/base_synchro/wizard/base_synchro_view.xml +++ b/addons/base_synchro/wizard/base_synchro_view.xml @@ -25,22 +25,22 @@ base.synchro form form + new - Base Synchronization base.synchro form - +