From fc48ba6eb07f9c8451d066ab214d05d3068f7409 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 13 Dec 2012 13:41:10 +0100 Subject: [PATCH 01/15] [ADD] translation FR on account_advanced_reconcile, account_statement_base_completion, account_statement_base_import and account_statement_ext --- account_advanced_reconcile/i18n/fr.po | 90 ++++++ account_statement_base_completion/i18n/fr.po | 181 +++++++++++ account_statement_base_import/i18n/fr.po | 253 ++++++++++++++++ account_statement_ext/i18n/fr.po | 301 +++++++++++++++++++ 4 files changed, 825 insertions(+) create mode 100644 account_advanced_reconcile/i18n/fr.po create mode 100644 account_statement_base_completion/i18n/fr.po create mode 100644 account_statement_base_import/i18n/fr.po create mode 100644 account_statement_ext/i18n/fr.po diff --git a/account_advanced_reconcile/i18n/fr.po b/account_advanced_reconcile/i18n/fr.po new file mode 100644 index 00000000..083890df --- /dev/null +++ b/account_advanced_reconcile/i18n/fr.po @@ -0,0 +1,90 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * account_advanced_reconcile +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 6.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-11-07 12:34+0000\n" +"PO-Revision-Date: 2012-11-07 12:34+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_advanced_reconcile +#: field:easy.reconcile.advanced,partner_ids:0 +#: field:easy.reconcile.advanced.ref,partner_ids:0 +msgid "Restrict on partners" +msgstr "Restriction sur les partenaires" + +#. module: account_advanced_reconcile +#: field:easy.reconcile.advanced,account_id:0 +#: field:easy.reconcile.advanced.ref,account_id:0 +msgid "Account" +msgstr "Compte" + +#. module: account_advanced_reconcile +#: model:ir.model,name:account_advanced_reconcile.model_account_easy_reconcile_method +msgid "reconcile method for account_easy_reconcile" +msgstr "Méthode de Lettrage pour le module account_easy_reconcile" + +#. module: account_advanced_reconcile +#: field:easy.reconcile.advanced,date_base_on:0 +#: field:easy.reconcile.advanced.ref,date_base_on:0 +msgid "Date of reconcilation" +msgstr "Date de Lettrage" + +#. module: account_advanced_reconcile +#: field:easy.reconcile.advanced,journal_id:0 +#: field:easy.reconcile.advanced.ref,journal_id:0 +msgid "Journal" +msgstr "Journal" + +#. module: account_advanced_reconcile +#: field:easy.reconcile.advanced,account_profit_id:0 +#: field:easy.reconcile.advanced.ref,account_profit_id:0 +msgid "Account Profit" +msgstr "Compte de produit" + +#. module: account_advanced_reconcile +#: field:easy.reconcile.advanced,filter:0 +#: field:easy.reconcile.advanced.ref,filter:0 +msgid "Filter" +msgstr "Filtre" + +#. module: account_advanced_reconcile +#: view:account.easy.reconcile:0 +msgid "Advanced. Partner and Ref" +msgstr "Avancé. Partenaire et Réf." + +#. module: account_advanced_reconcile +#: view:account.easy.reconcile:0 +msgid "Match multiple debit vs multiple credit entries. Allow partial reconcilation. The lines should have the partner, the credit entry ref. is matched vs the debit entry ref. or name." +msgstr "Le Lettrage peut s'éffectuer sur plusieurs écritures de débit et crédit. Le Lettrage partiel est autorisé. Les écritures doivent avoir le même partenaire et la référence sur les écritures de crédit doit se retrouver dans la référence ou la description sur les écritures de débit." + +#. module: account_advanced_reconcile +#: model:ir.model,name:account_advanced_reconcile.model_easy_reconcile_advanced +msgid "easy.reconcile.advanced" +msgstr "easy.reconcile.advanced" + +#. module: account_advanced_reconcile +#: field:easy.reconcile.advanced,account_lost_id:0 +#: field:easy.reconcile.advanced.ref,account_lost_id:0 +msgid "Account Lost" +msgstr "Compte de charge" + +#. module: account_advanced_reconcile +#: model:ir.model,name:account_advanced_reconcile.model_easy_reconcile_advanced_ref +msgid "easy.reconcile.advanced.ref" +msgstr "easy.reconcile.advanced.ref" + +#. module: account_advanced_reconcile +#: field:easy.reconcile.advanced,write_off:0 +#: field:easy.reconcile.advanced.ref,write_off:0 +msgid "Write off allowed" +msgstr "Ecart autorisé" + diff --git a/account_statement_base_completion/i18n/fr.po b/account_statement_base_completion/i18n/fr.po new file mode 100644 index 00000000..b91a9a63 --- /dev/null +++ b/account_statement_base_completion/i18n/fr.po @@ -0,0 +1,181 @@ +#. module: account_statement_base_completion +#: view:account.statement.completion.rule:0 +msgid "Related Profiles" +msgstr "Profiles liés" + +#. module: account_statement_base_completion +#: help:account.statement.completion.rule,sequence:0 +msgid "Lower means paresed first." +msgstr "Lower means paresed first." + +#. module: account_statement_base_completion +#: code:addons/account_statement_base_completion/statement.py:150 +#: code:addons/account_statement_base_completion/statement.py:182 +#: code:addons/account_statement_base_completion/statement.py:219 +#: code:addons/account_statement_base_completion/statement.py:252 +#, python-format +msgid "Line named \"%s\" (Ref:%s) was matched by more than one partner." +msgstr "Line named \"%s\" (Ref:%s) was matched by more than one partner." + +#. module: account_statement_base_completion +#: field:account.bank.statement,completion_logs:0 +msgid "Completion Log" +msgstr "Log des complétions" + +#. module: account_statement_base_completion +#: field:account.bank.statement.line,label:0 +msgid "Label" +msgstr "Description" + +#. module: account_statement_base_completion +#: help:account.bank.statement.line,label:0 +msgid "" +"Generiy field to store a label given from the bank/office on which we " +"can base the default/standard providen rule." +msgstr "" +"Ce champs permet de stocker une description complémentaire fournie par la banque." +"Le léttrage avancé pourra être effectué sur ce critère." + +#. module: account_statement_base_completion +#: model:ir.model,name:account_statement_base_completion.model_account_bank_statement +msgid "Bank Statement" +msgstr "Relevé bancaire" + +#. module: account_statement_base_completion +#: field:account.statement.completion.rule,function_to_call:0 +msgid "Method" +msgstr "Methode" + +#. module: account_statement_base_completion +#: code:addons/account_statement_base_completion/statement.py:352 +#, python-format +msgid "Bank Statement ID %s has %s lines completed by %s" +msgstr "Le relevé bancaire avec l'ID %s a %s lignes completées par %s" + +#. module: account_statement_base_completion +#: field:account.bank.statement.line,additionnal_bank_fields:0 +msgid "Additionnal infos from bank" +msgstr "Informations additionnelles de la banque" + +#. module: account_statement_base_completion +#: view:account.statement.profile:0 +msgid "Auto-Completion Rules" +msgstr "Règles d'auto-completion" + +#. module: account_statement_base_completion +#: help:account.bank.statement.line,additionnal_bank_fields:0 +msgid "" +"Used by completion and import system. Adds every field that is present in " +"your bank/office statement file" +msgstr "" +"Utilisé au niveau de l'auto-complétion et de l'import. Permet l'ajout de n'importe quel" +"champs additionnel communiqué par la banque" + +#. module: account_statement_base_completion +#: view:account.bank.statement:0 +msgid "Importation related infos" +msgstr "Importation des informations liées" + +#. module: account_statement_base_completion +#: model:ir.model,name:account_statement_base_completion.model_account_statement_profile +msgid "Statement Profil" +msgstr "Profil de relevé" + +#. module: account_statement_base_completion +#: field:account.statement.completion.rule,name:0 +msgid "Name" +msgstr "Nom" + +#. module: account_statement_base_completion +#: constraint:account.statement.profile:0 +msgid "You need to put a partner if you tic the 'Force partner on bank move' !" +msgstr "" +"Vous devez indiquer un partenaire si vous avez coché 'Indiquer un partenaire sur la ligne d'écriture de la banque' !" + +#. module: account_statement_base_completion +#: model:ir.model,name:account_statement_base_completion.model_account_bank_statement_line +msgid "Bank Statement Line" +msgstr "Ligne de relevé bancaire" + +#. module: account_statement_base_completion +#: view:account.statement.completion.rule:0 +#: model:ir.actions.act_window,name:account_statement_base_completion.action_st_completion_rule_tree +#: model:ir.ui.menu,name:account_statement_base_completion.menu_action_st_completion_rule_tree_menu +msgid "Statement Completion Rule" +msgstr "Règle d'auto-complétion du relevé" + +#. module: account_statement_base_completion +#: model:ir.model,name:account_statement_base_completion.model_account_statement_completion_rule +msgid "account.statement.completion.rule" +msgstr "account.statement.completion.rule" + +#. module: account_statement_base_completion +#: field:account.statement.completion.rule,profile_ids:0 +#: field:account.statement.profile,rule_ids:0 +msgid "Related statement profiles" +msgstr "Profils liés" + +#. module: account_statement_base_completion +#: constraint:account.bank.statement.line:0 +msgid "" +"The amount of the voucher must be the same amount as the one on the " +"statement line" +msgstr "" +"Le montant du justificatif doit être identique à celui de la ligne le " +"concernant sur le relevé" + +#. module: account_statement_base_completion +#: field:account.bank.statement.line,already_completed:0 +msgid "Auto-Completed" +msgstr "Auto-Completé" + +#. module: account_statement_base_completion +#: view:account.bank.statement:0 +msgid "Auto Completion" +msgstr "Auto-complétion" + +#. module: account_statement_base_completion +#: field:account.statement.completion.rule,sequence:0 +msgid "Sequence" +msgstr "Séquence" + +#. module: account_statement_base_completion +#: constraint:account.bank.statement:0 +msgid "The journal and period chosen have to belong to the same company." +msgstr "Le journal et la période doivent appartenir la même socité." + +#. module: account_statement_base_completion +#: field:res.partner,bank_statement_label:0 +msgid "Bank Statement Label" +msgstr "Description de relevé bancaire" + +#. module: account_statement_base_completion +#: help:account.bank.statement.line,already_completed:0 +msgid "" +"When this checkbox is ticked, the auto-completion process/button will ignore " +"this line." +msgstr "" +"Les lignes cochées seront ignorées si vous cliquez sur le bouton auto-complétion" +"this line." + +#. module: account_statement_base_completion +#: help:res.partner,bank_statement_label:0 +msgid "" +"Enter the various label found on your bank statement separated by a ; " +"If one of this label is include in the bank statement line, " +"the partner will be automatically filled (as long as you " +"use this method/rules in your statement profile)." +msgstr "" +"Entrez les différentes descriptions/informations sur votre relevé bancaire séparé par un ; " +"Si l'une d'entre elles figure dans la ligne du relevé, le partenaire correspondant pourra" +"être automatiquement retrouvé (à condition d'utiliser un règle de léttrage dans le profil)." + +#. module: account_statement_base_completion +#: model:ir.model,name:account_statement_base_completion.model_res_partner +msgid "Partner" +msgstr "Partenaire" + +#. module: account_statement_base_completion +#: view:account.bank.statement:0 +msgid "Completion Logs" +msgstr "Logs d'auto-complétion" diff --git a/account_statement_base_import/i18n/fr.po b/account_statement_base_import/i18n/fr.po new file mode 100644 index 00000000..a2ff98db --- /dev/null +++ b/account_statement_base_import/i18n/fr.po @@ -0,0 +1,253 @@ +#. module: account_statement_base_import +#: view:credit.statement.import:0 +#: model:ir.actions.act_window,name:account_statement_base_import.statement_importer_action +msgid "Import statement" +msgstr "Import de relevé" + +#. module: account_statement_base_import +#: model:ir.model,name:account_statement_base_import.model_credit_statement_import +msgid "credit.statement.import" +msgstr "credit.statement.import" + +#. module: account_statement_base_import +#: code:addons/account_statement_base_import/statement.py:218 +#, python-format +msgid "The statement cannot be created : %s" +msgstr "Le relevé ne peut être créé : %s" + +#. module: account_statement_base_import +#: field:credit.statement.import,input_statement:0 +msgid "Statement file" +msgstr "Fichier à importer" + +#. module: account_statement_base_import +#: view:account.statement.profile:0 +msgid "Import Logs" +msgstr "Logs d'import" + +#. module: account_statement_base_import +#: field:credit.statement.import,journal_id:0 +msgid "Financial journal to use transaction" +msgstr "Journal" + +#. module: account_statement_base_import +#: code:addons/account_statement_base_import/parser/file_parser.py:100 +#, python-format +msgid "Column %s not present in file" +msgstr "Colonne %s non présente dans le fichier" + +#. module: account_statement_base_import +#: view:account.statement.profile:0 +#: model:ir.ui.menu,name:account_statement_base_import.statement_importer_menu +msgid "Import Bank Statement" +msgstr "Importation de Relevé" + +#. module: account_statement_base_import +#: model:ir.model,name:account_statement_base_import.model_account_statement_profile +msgid "Statement Profil" +msgstr "Profil du relevé" + +#. module: account_statement_base_import +#: code:addons/account_statement_base_import/statement.py:100 +#, python-format +msgid "Commission line" +msgstr "Ligne de commission" + +#. module: account_statement_base_import +#: field:credit.statement.import,commission_account_id:0 +msgid "Commission account" +msgstr "Compte de commission" + +#. module: account_statement_base_import +#: code:addons/account_statement_base_import/statement.py:172 +#, python-format +msgid "Column %s you try to import is not present in the bank statement line !" +msgstr "" +"La colonne %s que vous essayer d'importer n'est pas présente dans la ligne de relevé !" + +#. module: account_statement_base_import +#: code:addons/account_statement_base_import/statement.py:71 +#, python-format +msgid "Bank Statement ID %s have been imported with %s lines " +msgstr "Le relevé avec l'ID %s a été importé avec %s lignes " + +#. module: account_statement_base_import +#: field:account.statement.profile,launch_import_completion:0 +msgid "Launch completion after import" +msgstr "Lancer l'auto-completion après import" + +#. module: account_statement_base_import +#: field:credit.statement.import,partner_id:0 +msgid "Credit insitute partner" +msgstr "Organisme bancaire" + +#. module: account_statement_base_import +#: code:addons/account_statement_base_import/statement.py:160 +#, python-format +msgid "No Profile !" +msgstr "Aucun Profil !" + +#. module: account_statement_base_import +#: view:account.statement.profile:0 +msgid "Import related infos" +msgstr "Importation des informations liées" + +#. module: account_statement_base_import +#: help:credit.statement.import,force_partner_on_bank:0 +msgid "" +"Tic that box if you want to use the credit insitute " +"partner in the " +"counterpart of the treasury/banking move." +msgstr "" +"Cochez cette case si vous voulez utiliser comme partenaire" +"l'organisme bancaire au niveau de la ligne de banque" + +#. module: account_statement_base_import +#: code:addons/account_statement_base_import/wizard/import_statement.py:93 +#, python-format +msgid "Please use a file with an extention" +msgstr "Veuillez sélectionner un fichier avec une extension" + +#. module: account_statement_base_import +#: code:addons/account_statement_base_import/statement.py:161 +#, python-format +msgid "You must provide a valid profile to import a bank statement !" +msgstr "Vous devez fournir un profil valide pour importer un relevé !" + +#. module: account_statement_base_import +#: help:credit.statement.import,balance_check:0 +msgid "" +"Tic that box if you want OpenERP to control the start/end " +"balance before confirming " +"a bank statement. If don't ticked, no balance control will be done." +msgstr "" +"Cochez cette case si vous souhaitez un contrôle du solde final" +"avant la validation du relevé." + +#. module: account_statement_base_import +#: code:addons/account_statement_base_import/parser/file_parser.py:31 +#: code:addons/account_statement_base_import/parser/generic_file_parser.py:31 +#, python-format +msgid "Please install python lib xlrd" +msgstr "Veuillez installer la librairie python lib xlrd" + +#. module: account_statement_base_import +#: code:addons/account_statement_base_import/parser/file_parser.py:58 +#, python-format +msgid "Invalide file type %s. please use csv or xls" +msgstr "Type de fichier invalide : %s. Veuillez utiliser un csv ou un xls" + +#. module: account_statement_base_import +#: field:account.statement.profile,last_import_date:0 +msgid "Last Import Date" +msgstr "Date de dernier import" + +#. module: account_statement_base_import +#: field:credit.statement.import,commission_analytic_id:0 +msgid "Commission analytic account" +msgstr "Compte analytique de la commission" + +#. module: account_statement_base_import +#: constraint:account.statement.profile:0 +msgid "You need to put a partner if you tic the 'Force partner on bank move' !" +msgstr "" +"Vous devez spécifier un partenaire si vous avez coché 'Forcer un partenaire sur la ligne de la banque' !" + +#. module: account_statement_base_import +#: code:addons/account_statement_base_import/statement.py:217 +#, python-format +msgid "Statement import error" +msgstr "Erreur d'import de relevé" + +#. module: account_statement_base_import +#: field:account.bank.statement.line,commission_amount:0 +msgid "Line Commission Amount" +msgstr "Montant de la commission de la ligne" + +#. module: account_statement_base_import +#: code:addons/account_statement_base_import/statement.py:171 +#, python-format +msgid "Missing column !" +msgstr "Colonne manquante !" + +#. module: account_statement_base_import +#: field:account.statement.profile,rec_log:0 +msgid "log" +msgstr "log" + +#. module: account_statement_base_import +#: field:account.statement.profile,import_type:0 +msgid "Type of import" +msgstr "Type d'import" + +#. module: account_statement_base_import +#: constraint:account.bank.statement.line:0 +msgid "" +"The amount of the voucher must be the same amount as the one on the " +"statement line" +msgstr "" +"Le montant du justificatif doit tre identique à celui de la ligne le " +"concernant sur le relevé" + +#. module: account_statement_base_import +#: help:account.statement.profile,launch_import_completion:0 +msgid "" +"Tic that box to automatically launch the completion on each " +"imported file using this profile." +msgstr "" +"Cocher cette case pour lancer automatiquement l'auto-complétion sur" +"chaque fichier importé avec ce profil." + +#. module: account_statement_base_import +#: field:credit.statement.import,profile_id:0 +msgid "Import configuration parameter" +msgstr "Parametres de configuration d'import" + +#. module: account_statement_base_import +#: code:addons/account_statement_base_import/parser/parser.py:156 +#, python-format +msgid "No buffer file given." +msgstr "Pas de fichier tampon donné." + +#. module: account_statement_base_import +#: view:credit.statement.import:0 +msgid "Import Parameters Summary" +msgstr "Résumé des paramètres d'import" + +#. module: account_statement_base_import +#: field:credit.statement.import,balance_check:0 +msgid "Balance check" +msgstr "Vérification des soldes" + +#. module: account_statement_base_import +#: model:ir.model,name:account_statement_base_import.model_account_bank_statement_line +msgid "Bank Statement Line" +msgstr "Ligne de relevé bancaire" + +#. module: account_statement_base_import +#: field:credit.statement.import,force_partner_on_bank:0 +msgid "Force partner on bank move" +msgstr "Forcer un partenaire sur la ligne du compte de banque" + +#. module: account_statement_base_import +#: field:credit.statement.import,file_name:0 +msgid "File Name" +msgstr "Nom du fichier" + +#. module: account_statement_base_import +#: field:credit.statement.import,receivable_account_id:0 +msgid "Force Receivable/Payable Account" +msgstr "Forcer le compte Client/Fournisseur" + +#. module: account_statement_base_import +#: help:account.statement.profile,import_type:0 +msgid "" +"Choose here the method by which you want to import bank statement for this " +"profile." +msgstr "" +"Choisissez la méthode d'import de relevé pour ce profil." + +#. module: account_statement_base_import +#: view:credit.statement.import:0 +msgid "Cancel" +msgstr "Annulation" diff --git a/account_statement_ext/i18n/fr.po b/account_statement_ext/i18n/fr.po new file mode 100644 index 00000000..08eebe13 --- /dev/null +++ b/account_statement_ext/i18n/fr.po @@ -0,0 +1,301 @@ +#. module: account_statement_ext +#: model:ir.actions.act_window,name:account_statement_ext.action_treasury_statement_profile_tree +#: model:ir.ui.menu,name:account_statement_ext.menu_treasury_statement_profile_tree +msgid "Bank Statements Profile" +msgstr "Profil de relevé bancaire" + +#. module: account_statement_ext +#: code:addons/account_statement_ext/statement.py:423 +#, python-format +msgid "Can not determine account" +msgstr "Impossible de trouver le compte" + +#. module: account_statement_ext +#: constraint:account.move:0 +msgid "You can not create more than one move per period on centralized journal" +msgstr "" +"Vous ne pouvez pas crer plus d'un mouvement par période dans un journal " +"centralisateur" + +#. module: account_statement_ext +#: view:account.statement.profile:0 +msgid "Import statement" +msgstr "Importation du relevé" + +#. module: account_statement_ext +#: field:account.statement.profile,bank_statement_prefix:0 +msgid "Bank Statement Prefix" +msgstr "Préfix du No de Relevé" + +#. module: account_statement_ext +#: field:account.bank.statement,profile_id:0 +msgid "Profil" +msgstr "Profile" + +#. module: account_statement_ext +#: code:addons/account_statement_ext/statement.py:362 +#, python-format +msgid "Please verify that an account is defined in the journal." +msgstr "Veuillez vérifier que ce compte est défini au niveau du journal." + +#. module: account_statement_ext +#: code:addons/account_statement_ext/statement.py:361 +#, python-format +msgid "Configuration Error !" +msgstr "Erreur de configuration !" + +#. module: account_statement_ext +#: field:account.statement.profile,receivable_account_id:0 +msgid "Force Receivable/Payable Account" +msgstr "Remplacer le compte client/fournisseur par defaut par " + +#. module: account_statement_ext +#: field:account.statement.profile,commission_account_id:0 +msgid "Commission account" +msgstr "Compte de commission" + +#. module: account_statement_ext +#: view:account.bank.statement:0 +#: field:account.bank.statement,credit_partner_id:0 +msgid "Financial Partner" +msgstr "Banque ou Organisme financier" + +#. module: account_statement_ext +#: code:addons/account_statement_ext/statement.py:307 +#: code:addons/account_statement_ext/statement.py:372 +#, python-format +msgid "Error !" +msgstr "Erreur !" + +#. module: account_statement_ext +#: field:account.statement.profile,partner_id:0 +msgid "Bank/Payment Office partner" +msgstr "Banque ou Organisme financier" + +#. module: account_statement_ext +#: code:addons/account_statement_ext/statement.py:373 +#, python-format +msgid "The account entries lines are not in valid state." +msgstr "Les écritures comptables ne sont pas équilibrées." + +#. module: account_statement_ext +#: constraint:account.statement.profile:0 +msgid "You need to put a partner if you tic the 'Force partner on bank move' !" +msgstr "" +"Vous devez choisir un pertenaire si vous cochez 'Remplacer le compte client/fournisseur' !" + +#. module: account_statement_ext +#: help:account.statement.profile,force_partner_on_bank:0 +msgid "" +"Tic that box if you want to use the credit insitute " +"partner in the " +"counterpart of the intermediat/banking move." +msgstr "" +"Cochez cette case si vous voulez utiliser le partenaire fiancier dans" +"la contrepartie de l'écriture." + +#. module: account_statement_ext +#: report:addons/account_statement_ext/report/bank_statement_report.mako:20 +msgid "Date" +msgstr "Date" + +#. module: account_statement_ext +#: code:addons/account_statement_ext/statement.py:308 +#, python-format +msgid "Journal item \"%s\" is not valid." +msgstr "L'écriture \"%s\" n'est pas équilibrée." + +#. module: account_statement_ext +#: code:addons/account_statement_ext/statement.py:424 +#, python-format +msgid "Please ensure that minimal properties are set" +msgstr "Veuillez vérifiez que les propriétés miminales sont bien paramétrées" + +#. module: account_statement_ext +#: view:account.bank.statement:0 +msgid "Balance Check" +msgstr "Controle sur Solde final" + +#. module: account_statement_ext +#: view:account.bank.statement:0 +msgid "Profile Details" +msgstr "Détails du profile" + +#. module: account_statement_ext +#: model:ir.model,name:account_statement_ext.model_account_statement_profile +msgid "Statement Profil" +msgstr "Profile du relevé" + +#. module: account_statement_ext +#: field:account.statement.profile,name:0 +msgid "Name" +msgstr "Nom" + +#. module: account_statement_ext +#: field:account.statement.profile,commission_analytic_id:0 +msgid "Commission analytic account" +msgstr "Compte analytique affecter la Commission" + +#. module: account_statement_ext +#: constraint:account.move:0 +msgid "The date of your Journal Entry is not in the defined period!" +msgstr "La date de l'écriture n'est pas dans la période définie!" + +#. module: account_statement_ext +#: help:account.statement.profile,balance_check:0 +msgid "" +"Tic that box if you want OpenERP to control the start/" +"end balance before " +"confirming a bank statement. If don't ticked, " +"no balance control will " +"be done." +msgstr "" +"Cochez cette case si vous voulez qu'OpenERP fasse " +"une vérification au niveau du solde final avant confirmation." + +#. module: account_statement_ext +#: code:addons/account_statement_ext/report/bank_statement_report.py:40 +#: code:addons/account_statement_ext/report/bank_statement_report.py:48 +#, python-format +msgid "BORDEREAU DE REMISE DE CHEQUES" +msgstr "BORDEREAU DE REMISE DE CHEQUES" + +#. module: account_statement_ext +#: code:addons/account_statement_ext/statement.py:400 +#, python-format +msgid "Statement %s is confirmed, journal items are created." +msgstr "Le releve %s est confirmé, les écritires comptables ont été générées." + +#. module: account_statement_ext +#: report:addons/account_statement_ext/report/bank_statement_report.mako:37 +msgid "Montant" +msgstr "Montant" + +#. module: account_statement_ext +#: code:addons/account_statement_ext/statement.py:394 +#, python-format +msgid "Error" +msgstr "Erreur" + +#. module: account_statement_ext +#: help:account.statement.profile,partner_id:0 +msgid "" +"Put a partner if you want to have it on the commission " +"move (and optionaly on the counterpart " +"of the intermediate/banking move if " +"you tic the corresponding checkbox)." +msgstr "" +"Selectionnez un partenaire si vous voulez l'avoir dans l'écriture comptable" +"au niveau de la commision (et du compte de trésorerie selon les cas si vous cochez" +"la case 'Indiquer un partenaire sur la ligne d'écriture de la banque ou organisme')." + +#. module: account_statement_ext +#: constraint:account.bank.statement.line:0 +msgid "" +"The amount of the voucher must be the same amount as the one on the " +"statement line" +msgstr "" +"Le montant du justificatif doit tre identique celui de la ligne le " +"concernant sur le relevé" + +#. module: account_statement_ext +#: code:addons/account_statement_ext/report/bank_statement_report.py:57 +#, python-format +msgid "Page" +msgstr "Page" + +#. module: account_statement_ext +#: field:account.bank.statement,balance_check:0 +#: field:account.statement.profile,balance_check:0 +msgid "Balance check" +msgstr "Activation controle du solde final" + +#. module: account_statement_ext +#: model:ir.model,name:account_statement_ext.model_account_bank_statement_line +msgid "Bank Statement Line" +msgstr "Ligne de relevé bancaire" + +#. module: account_statement_ext +#: model:ir.model,name:account_statement_ext.model_account_move +msgid "Account Entry" +msgstr "Ecriture comptable" + +#. module: account_statement_ext +#: field:account.statement.profile,force_partner_on_bank:0 +msgid "Force partner on bank move" +msgstr "Indiquer un partenaire sur la ligne d'écriture de la banque" + +#. module: account_statement_ext +#: report:addons/account_statement_ext/report/bank_statement_report.mako:33 +msgid "Reference" +msgstr "Réference" + +#. module: account_statement_ext +#: code:addons/account_statement_ext/statement.py:380 +#, python-format +msgid "No Analytic Journal !" +msgstr "Pas de journal analytique trouvé !" + +#. module: account_statement_ext +#: code:addons/account_statement_ext/report/bank_statement_report.py:57 +#, python-format +msgid "of" +msgstr "de" + +#. module: account_statement_ext +#: field:account.statement.profile,bank_statement_ids:0 +msgid "Bank Statement Imported" +msgstr "Relevé importé" + +#. module: account_statement_ext +#: field:account.bank.statement.line,period_id:0 +msgid "Period" +msgstr "Periode" + +#. module: account_statement_ext +#: constraint:account.bank.statement:0 +msgid "The journal and period chosen have to belong to the same company." +msgstr "Le journal et la période doivent appartenir la même société." + +#. module: account_statement_ext +#: model:ir.actions.report.xml,name:account_statement_ext.report_bank_statement_webkit +#: model:ir.model,name:account_statement_ext.model_account_bank_statement +msgid "Bank Statement" +msgstr "Relevé bancaire" + +#. module: account_statement_ext +#: report:addons/account_statement_ext/report/bank_statement_report.mako:35 +msgid "Partenaire" +msgstr "Partenaire" + +#. module: account_statement_ext +#: help:account.statement.profile,receivable_account_id:0 +msgid "" +"Choose a receivable account to force the " +"default debit/credit " +"account (eg. an intermediat bank account instead " +"of default debitors)." +msgstr "" +"Selectionnez un compte de type client ou fournisseur afin de remplacer " +"le compte client ou fournisseur par default" + +#. module: account_statement_ext +#: code:addons/account_statement_ext/statement.py:381 +#, python-format +msgid "You have to assign an analytic journal on the '%s' journal!" +msgstr "Vous devez associer un journal analytique au journal comptable '%s'." + +#. module: account_statement_ext +#: model:ir.actions.act_window,name:account_statement_ext.act_bank_statement_from_profile +msgid "Open Statements" +msgstr "Relevés ouverts" + +#. module: account_statement_ext +#: field:account.statement.profile,journal_id:0 +msgid "Financial journal to use for transaction" +msgstr "Journal à utiliser pour cette écriture" + +#. module: account_statement_ext +#: report:addons/account_statement_ext/report/bank_statement_report.mako:19 +msgid "Bordereau" +msgstr "Bordereau" From 4446af911d0720b384da0af312d1a10df94323eb Mon Sep 17 00:00:00 2001 From: "Guewen Baconnier @ Camptocamp" Date: Thu, 13 Dec 2012 14:57:29 +0100 Subject: [PATCH 02/15] [FIX] typos --- account_advanced_reconcile/i18n/fr.po | 8 ++-- account_statement_base_completion/i18n/fr.po | 29 ++++++------ .../statement.py | 2 +- account_statement_base_import/i18n/fr.po | 20 ++++----- account_statement_ext/i18n/fr.po | 44 +++++++++---------- 5 files changed, 51 insertions(+), 52 deletions(-) diff --git a/account_advanced_reconcile/i18n/fr.po b/account_advanced_reconcile/i18n/fr.po index 083890df..b5f20627 100644 --- a/account_advanced_reconcile/i18n/fr.po +++ b/account_advanced_reconcile/i18n/fr.po @@ -30,13 +30,13 @@ msgstr "Compte" #. module: account_advanced_reconcile #: model:ir.model,name:account_advanced_reconcile.model_account_easy_reconcile_method msgid "reconcile method for account_easy_reconcile" -msgstr "Méthode de Lettrage pour le module account_easy_reconcile" +msgstr "Méthode de lettrage pour le module account_easy_reconcile" #. module: account_advanced_reconcile #: field:easy.reconcile.advanced,date_base_on:0 #: field:easy.reconcile.advanced.ref,date_base_on:0 msgid "Date of reconcilation" -msgstr "Date de Lettrage" +msgstr "Date de lettrage" #. module: account_advanced_reconcile #: field:easy.reconcile.advanced,journal_id:0 @@ -64,7 +64,7 @@ msgstr "Avancé. Partenaire et Réf." #. module: account_advanced_reconcile #: view:account.easy.reconcile:0 msgid "Match multiple debit vs multiple credit entries. Allow partial reconcilation. The lines should have the partner, the credit entry ref. is matched vs the debit entry ref. or name." -msgstr "Le Lettrage peut s'éffectuer sur plusieurs écritures de débit et crédit. Le Lettrage partiel est autorisé. Les écritures doivent avoir le même partenaire et la référence sur les écritures de crédit doit se retrouver dans la référence ou la description sur les écritures de débit." +msgstr "Le Lettrage peut s'effectuer sur plusieurs écritures de débit et crédit. Le Lettrage partiel est autorisé. Les écritures doivent avoir le même partenaire et la référence sur les écritures de crédit doit se retrouver dans la référence ou la description sur les écritures de débit." #. module: account_advanced_reconcile #: model:ir.model,name:account_advanced_reconcile.model_easy_reconcile_advanced @@ -86,5 +86,5 @@ msgstr "easy.reconcile.advanced.ref" #: field:easy.reconcile.advanced,write_off:0 #: field:easy.reconcile.advanced.ref,write_off:0 msgid "Write off allowed" -msgstr "Ecart autorisé" +msgstr "Écart autorisé" diff --git a/account_statement_base_completion/i18n/fr.po b/account_statement_base_completion/i18n/fr.po index b91a9a63..efcb38ad 100644 --- a/account_statement_base_completion/i18n/fr.po +++ b/account_statement_base_completion/i18n/fr.po @@ -1,12 +1,12 @@ #. module: account_statement_base_completion #: view:account.statement.completion.rule:0 msgid "Related Profiles" -msgstr "Profiles liés" +msgstr "Profils liés" #. module: account_statement_base_completion #: help:account.statement.completion.rule,sequence:0 -msgid "Lower means paresed first." -msgstr "Lower means paresed first." +msgid "Lower means parsed first." +msgstr "Plus petite séquence analysée en premier." #. module: account_statement_base_completion #: code:addons/account_statement_base_completion/statement.py:150 @@ -15,12 +15,12 @@ msgstr "Lower means paresed first." #: code:addons/account_statement_base_completion/statement.py:252 #, python-format msgid "Line named \"%s\" (Ref:%s) was matched by more than one partner." -msgstr "Line named \"%s\" (Ref:%s) was matched by more than one partner." +msgstr "La ligne nommée \"%s\" (Ref:%s) correspond à plusieurs partenaires." #. module: account_statement_base_completion #: field:account.bank.statement,completion_logs:0 msgid "Completion Log" -msgstr "Log des complétions" +msgstr "Journal des complétions" #. module: account_statement_base_completion #: field:account.bank.statement.line,label:0 @@ -34,7 +34,7 @@ msgid "" "can base the default/standard providen rule." msgstr "" "Ce champs permet de stocker une description complémentaire fournie par la banque." -"Le léttrage avancé pourra être effectué sur ce critère." +"Le lettrage avancé pourra être effectué sur ce critère." #. module: account_statement_base_completion #: model:ir.model,name:account_statement_base_completion.model_account_bank_statement @@ -44,7 +44,7 @@ msgstr "Relevé bancaire" #. module: account_statement_base_completion #: field:account.statement.completion.rule,function_to_call:0 msgid "Method" -msgstr "Methode" +msgstr "Méthode" #. module: account_statement_base_completion #: code:addons/account_statement_base_completion/statement.py:352 @@ -60,7 +60,7 @@ msgstr "Informations additionnelles de la banque" #. module: account_statement_base_completion #: view:account.statement.profile:0 msgid "Auto-Completion Rules" -msgstr "Règles d'auto-completion" +msgstr "Règles d'auto-complétion" #. module: account_statement_base_completion #: help:account.bank.statement.line,additionnal_bank_fields:0 @@ -68,7 +68,7 @@ msgid "" "Used by completion and import system. Adds every field that is present in " "your bank/office statement file" msgstr "" -"Utilisé au niveau de l'auto-complétion et de l'import. Permet l'ajout de n'importe quel" +"Utilisé au niveau de l'auto-complétion et de l'import. Permet l'ajout de n'importe quel " "champs additionnel communiqué par la banque" #. module: account_statement_base_completion @@ -142,7 +142,7 @@ msgstr "Séquence" #. module: account_statement_base_completion #: constraint:account.bank.statement:0 msgid "The journal and period chosen have to belong to the same company." -msgstr "Le journal et la période doivent appartenir la même socité." +msgstr "Le journal et la période doivent appartenir à la même société." #. module: account_statement_base_completion #: field:res.partner,bank_statement_label:0 @@ -155,8 +155,7 @@ msgid "" "When this checkbox is ticked, the auto-completion process/button will ignore " "this line." msgstr "" -"Les lignes cochées seront ignorées si vous cliquez sur le bouton auto-complétion" -"this line." +"Les lignes cochées seront ignorées lorsque vous cliquez sur le bouton auto-complétion" #. module: account_statement_base_completion #: help:res.partner,bank_statement_label:0 @@ -166,9 +165,9 @@ msgid "" "the partner will be automatically filled (as long as you " "use this method/rules in your statement profile)." msgstr "" -"Entrez les différentes descriptions/informations sur votre relevé bancaire séparé par un ; " +"Entrez les différentes descriptions/informations sur votre relevé bancaire séparées par un ';' " "Si l'une d'entre elles figure dans la ligne du relevé, le partenaire correspondant pourra" -"être automatiquement retrouvé (à condition d'utiliser un règle de léttrage dans le profil)." +"être automatiquement retrouvé (à condition d'utiliser un règle de lettrage dans le profil)." #. module: account_statement_base_completion #: model:ir.model,name:account_statement_base_completion.model_res_partner @@ -178,4 +177,4 @@ msgstr "Partenaire" #. module: account_statement_base_completion #: view:account.bank.statement:0 msgid "Completion Logs" -msgstr "Logs d'auto-complétion" +msgstr "Journaux d'auto-complétion" diff --git a/account_statement_base_completion/statement.py b/account_statement_base_completion/statement.py index b45f5d8c..f849bc01 100644 --- a/account_statement_base_completion/statement.py +++ b/account_statement_base_completion/statement.py @@ -113,7 +113,7 @@ class AccountStatementCompletionRule(Model): ] _columns={ - 'sequence': fields.integer('Sequence', help="Lower means paresed first."), + 'sequence': fields.integer('Sequence', help="Lower means parsed first."), 'name': fields.char('Name', size=128), 'profile_ids': fields.many2many('account.statement.profile', rel='as_rul_st_prof_rel', diff --git a/account_statement_base_import/i18n/fr.po b/account_statement_base_import/i18n/fr.po index a2ff98db..747b6de9 100644 --- a/account_statement_base_import/i18n/fr.po +++ b/account_statement_base_import/i18n/fr.po @@ -23,7 +23,7 @@ msgstr "Fichier à importer" #. module: account_statement_base_import #: view:account.statement.profile:0 msgid "Import Logs" -msgstr "Logs d'import" +msgstr "Journaux d'import" #. module: account_statement_base_import #: field:credit.statement.import,journal_id:0 @@ -40,7 +40,7 @@ msgstr "Colonne %s non présente dans le fichier" #: view:account.statement.profile:0 #: model:ir.ui.menu,name:account_statement_base_import.statement_importer_menu msgid "Import Bank Statement" -msgstr "Importation de Relevé" +msgstr "Importation de relevé" #. module: account_statement_base_import #: model:ir.model,name:account_statement_base_import.model_account_statement_profile @@ -63,7 +63,7 @@ msgstr "Compte de commission" #, python-format msgid "Column %s you try to import is not present in the bank statement line !" msgstr "" -"La colonne %s que vous essayer d'importer n'est pas présente dans la ligne de relevé !" +"La colonne %s que vous essayez d'importer n'est pas présente dans la ligne de relevé !" #. module: account_statement_base_import #: code:addons/account_statement_base_import/statement.py:71 @@ -74,7 +74,7 @@ msgstr "Le relevé avec l'ID %s a été importé avec %s lignes " #. module: account_statement_base_import #: field:account.statement.profile,launch_import_completion:0 msgid "Launch completion after import" -msgstr "Lancer l'auto-completion après import" +msgstr "Lancer l'auto-complétion après import" #. module: account_statement_base_import #: field:credit.statement.import,partner_id:0 @@ -99,7 +99,7 @@ msgid "" "partner in the " "counterpart of the treasury/banking move." msgstr "" -"Cochez cette case si vous voulez utiliser comme partenaire" +"Cochez cette case si vous voulez utiliser comme partenaire " "l'organisme bancaire au niveau de la ligne de banque" #. module: account_statement_base_import @@ -121,7 +121,7 @@ msgid "" "balance before confirming " "a bank statement. If don't ticked, no balance control will be done." msgstr "" -"Cochez cette case si vous souhaitez un contrôle du solde final" +"Cochez cette case si vous souhaitez un contrôle du solde final " "avant la validation du relevé." #. module: account_statement_base_import @@ -129,7 +129,7 @@ msgstr "" #: code:addons/account_statement_base_import/parser/generic_file_parser.py:31 #, python-format msgid "Please install python lib xlrd" -msgstr "Veuillez installer la librairie python lib xlrd" +msgstr "Veuillez installer la bibliothèque python xlrd" #. module: account_statement_base_import #: code:addons/account_statement_base_import/parser/file_parser.py:58 @@ -173,7 +173,7 @@ msgstr "Colonne manquante !" #. module: account_statement_base_import #: field:account.statement.profile,rec_log:0 msgid "log" -msgstr "log" +msgstr "journal" #. module: account_statement_base_import #: field:account.statement.profile,import_type:0 @@ -186,7 +186,7 @@ msgid "" "The amount of the voucher must be the same amount as the one on the " "statement line" msgstr "" -"Le montant du justificatif doit tre identique à celui de la ligne le " +"Le montant du justificatif doit être identique à celui de la ligne le " "concernant sur le relevé" #. module: account_statement_base_import @@ -201,7 +201,7 @@ msgstr "" #. module: account_statement_base_import #: field:credit.statement.import,profile_id:0 msgid "Import configuration parameter" -msgstr "Parametres de configuration d'import" +msgstr "Paramètres de configuration d'import" #. module: account_statement_base_import #: code:addons/account_statement_base_import/parser/parser.py:156 diff --git a/account_statement_ext/i18n/fr.po b/account_statement_ext/i18n/fr.po index 08eebe13..d399db56 100644 --- a/account_statement_ext/i18n/fr.po +++ b/account_statement_ext/i18n/fr.po @@ -14,7 +14,7 @@ msgstr "Impossible de trouver le compte" #: constraint:account.move:0 msgid "You can not create more than one move per period on centralized journal" msgstr "" -"Vous ne pouvez pas crer plus d'un mouvement par période dans un journal " +"Vous ne pouvez pas créer plus d'un mouvement par période dans un journal " "centralisateur" #. module: account_statement_ext @@ -25,12 +25,12 @@ msgstr "Importation du relevé" #. module: account_statement_ext #: field:account.statement.profile,bank_statement_prefix:0 msgid "Bank Statement Prefix" -msgstr "Préfix du No de Relevé" +msgstr "Préfixe du N° de Relevé" #. module: account_statement_ext #: field:account.bank.statement,profile_id:0 msgid "Profil" -msgstr "Profile" +msgstr "Profil" #. module: account_statement_ext #: code:addons/account_statement_ext/statement.py:362 @@ -47,7 +47,7 @@ msgstr "Erreur de configuration !" #. module: account_statement_ext #: field:account.statement.profile,receivable_account_id:0 msgid "Force Receivable/Payable Account" -msgstr "Remplacer le compte client/fournisseur par defaut par " +msgstr "Remplacer le compte client/fournisseur par défaut par " #. module: account_statement_ext #: field:account.statement.profile,commission_account_id:0 @@ -82,7 +82,7 @@ msgstr "Les écritures comptables ne sont pas équilibrées." #: constraint:account.statement.profile:0 msgid "You need to put a partner if you tic the 'Force partner on bank move' !" msgstr "" -"Vous devez choisir un pertenaire si vous cochez 'Remplacer le compte client/fournisseur' !" +"Vous devez choisir un partenaire si vous cochez 'Remplacer le compte client/fournisseur' !" #. module: account_statement_ext #: help:account.statement.profile,force_partner_on_bank:0 @@ -91,7 +91,7 @@ msgid "" "partner in the " "counterpart of the intermediat/banking move." msgstr "" -"Cochez cette case si vous voulez utiliser le partenaire fiancier dans" +"Cochez cette case si vous voulez utiliser le partenaire financier dans " "la contrepartie de l'écriture." #. module: account_statement_ext @@ -109,22 +109,22 @@ msgstr "L'écriture \"%s\" n'est pas équilibrée." #: code:addons/account_statement_ext/statement.py:424 #, python-format msgid "Please ensure that minimal properties are set" -msgstr "Veuillez vérifiez que les propriétés miminales sont bien paramétrées" +msgstr "Veuillez vérifiez que les propriétés minimales sont bien paramétrées" #. module: account_statement_ext #: view:account.bank.statement:0 msgid "Balance Check" -msgstr "Controle sur Solde final" +msgstr "Contrôle sur solde final" #. module: account_statement_ext #: view:account.bank.statement:0 msgid "Profile Details" -msgstr "Détails du profile" +msgstr "Détails du profil" #. module: account_statement_ext #: model:ir.model,name:account_statement_ext.model_account_statement_profile msgid "Statement Profil" -msgstr "Profile du relevé" +msgstr "Profil du relevé" #. module: account_statement_ext #: field:account.statement.profile,name:0 @@ -134,7 +134,7 @@ msgstr "Nom" #. module: account_statement_ext #: field:account.statement.profile,commission_analytic_id:0 msgid "Commission analytic account" -msgstr "Compte analytique affecter la Commission" +msgstr "Compte analytique où affecter la commission" #. module: account_statement_ext #: constraint:account.move:0 @@ -164,7 +164,7 @@ msgstr "BORDEREAU DE REMISE DE CHEQUES" #: code:addons/account_statement_ext/statement.py:400 #, python-format msgid "Statement %s is confirmed, journal items are created." -msgstr "Le releve %s est confirmé, les écritires comptables ont été générées." +msgstr "Le relevé %s est confirmé, les écritures comptables ont été générées." #. module: account_statement_ext #: report:addons/account_statement_ext/report/bank_statement_report.mako:37 @@ -185,8 +185,8 @@ msgid "" "of the intermediate/banking move if " "you tic the corresponding checkbox)." msgstr "" -"Selectionnez un partenaire si vous voulez l'avoir dans l'écriture comptable" -"au niveau de la commision (et du compte de trésorerie selon les cas si vous cochez" +"Sélectionnez un partenaire si vous voulez l'avoir dans l'écriture comptable " +"au niveau de la commision (et du compte de trésorerie selon les cas si vous cochez " "la case 'Indiquer un partenaire sur la ligne d'écriture de la banque ou organisme')." #. module: account_statement_ext @@ -195,7 +195,7 @@ msgid "" "The amount of the voucher must be the same amount as the one on the " "statement line" msgstr "" -"Le montant du justificatif doit tre identique celui de la ligne le " +"Le montant du justificatif doit être identique à celui de la ligne le " "concernant sur le relevé" #. module: account_statement_ext @@ -208,7 +208,7 @@ msgstr "Page" #: field:account.bank.statement,balance_check:0 #: field:account.statement.profile,balance_check:0 msgid "Balance check" -msgstr "Activation controle du solde final" +msgstr "Activation contrôle du solde final" #. module: account_statement_ext #: model:ir.model,name:account_statement_ext.model_account_bank_statement_line @@ -218,7 +218,7 @@ msgstr "Ligne de relevé bancaire" #. module: account_statement_ext #: model:ir.model,name:account_statement_ext.model_account_move msgid "Account Entry" -msgstr "Ecriture comptable" +msgstr "Écriture comptable" #. module: account_statement_ext #: field:account.statement.profile,force_partner_on_bank:0 @@ -228,7 +228,7 @@ msgstr "Indiquer un partenaire sur la ligne d'écriture de la banque" #. module: account_statement_ext #: report:addons/account_statement_ext/report/bank_statement_report.mako:33 msgid "Reference" -msgstr "Réference" +msgstr "Référence" #. module: account_statement_ext #: code:addons/account_statement_ext/statement.py:380 @@ -250,12 +250,12 @@ msgstr "Relevé importé" #. module: account_statement_ext #: field:account.bank.statement.line,period_id:0 msgid "Period" -msgstr "Periode" +msgstr "Période" #. module: account_statement_ext #: constraint:account.bank.statement:0 msgid "The journal and period chosen have to belong to the same company." -msgstr "Le journal et la période doivent appartenir la même société." +msgstr "Le journal et la période doivent appartenir à la même société." #. module: account_statement_ext #: model:ir.actions.report.xml,name:account_statement_ext.report_bank_statement_webkit @@ -276,8 +276,8 @@ msgid "" "account (eg. an intermediat bank account instead " "of default debitors)." msgstr "" -"Selectionnez un compte de type client ou fournisseur afin de remplacer " -"le compte client ou fournisseur par default" +"Sélectionnez un compte de type client ou fournisseur afin de remplacer " +"le compte client ou fournisseur par défaut" #. module: account_statement_ext #: code:addons/account_statement_ext/statement.py:381 From f66bd8c4591a0574d34b7086c05cd8af7b40febb Mon Sep 17 00:00:00 2001 From: "Guewen Baconnier @ Camptocamp" Date: Wed, 19 Dec 2012 11:55:57 +0100 Subject: [PATCH 03/15] [ADD] structure for the reconciliation history --- account_easy_reconcile/__init__.py | 1 + account_easy_reconcile/__openerp__.py | 5 +- .../easy_reconcile_history.py | 39 ++++++++++ .../easy_reconcile_history_view.xml | 75 +++++++++++++++++++ 4 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 account_easy_reconcile/easy_reconcile_history.py create mode 100644 account_easy_reconcile/easy_reconcile_history_view.xml diff --git a/account_easy_reconcile/__init__.py b/account_easy_reconcile/__init__.py index 19e90a30..b648751f 100755 --- a/account_easy_reconcile/__init__.py +++ b/account_easy_reconcile/__init__.py @@ -22,3 +22,4 @@ import easy_reconcile import base_reconciliation import simple_reconciliation +import easy_reconcile_history diff --git a/account_easy_reconcile/__openerp__.py b/account_easy_reconcile/__openerp__.py index 3d341325..cae7ca12 100755 --- a/account_easy_reconcile/__openerp__.py +++ b/account_easy_reconcile/__openerp__.py @@ -48,7 +48,10 @@ This latter add more complex reconciliations, allows multiple lines and partial. "category" : "Finance", "init_xml" : [], "demo_xml" : [], - "update_xml" : ["easy_reconcile.xml"], + "update_xml" : [ + "easy_reconcile.xml", + "easy_reconcile_history_view.xml", + ], 'license': 'AGPL-3', "auto_install": False, "installable": True, diff --git a/account_easy_reconcile/easy_reconcile_history.py b/account_easy_reconcile/easy_reconcile_history.py new file mode 100644 index 00000000..e37e2c52 --- /dev/null +++ b/account_easy_reconcile/easy_reconcile_history.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Author: Guewen Baconnier +# Copyright 2012 Camptocamp SA +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from openerp.osv import orm, fields + + +class easy_reconcile_history(orm.Model): + """ Store an history of the runs per profile + Each history stores the list of reconciliations done""" + + _name = 'easy.reconcile.history' + + _columns = { + 'easy_reconcile_id': fields.many2one( + 'account.easy.reconcile', 'Reconcile Profile', readonly=True), + 'date': fields.datetime('Run date', readonly=True), + 'reconcile_ids': fields.many2many( + 'account.move.reconcile', string='Reconciliations', readonly=True), + 'reconcile_partial_ids': fields.many2many( + 'account.move.reconcile', string='Partial Reconciliations', readonly=True), + } diff --git a/account_easy_reconcile/easy_reconcile_history_view.xml b/account_easy_reconcile/easy_reconcile_history_view.xml new file mode 100644 index 00000000..a11edf91 --- /dev/null +++ b/account_easy_reconcile/easy_reconcile_history_view.xml @@ -0,0 +1,75 @@ + + + + + + easy.reconcile.history.search + easy.reconcile.history + search + + + + + + + + + + + + + + + + + + + easy.reconcile.history.form + 16 + easy.reconcile.history + form + +
+ + + + + + +
+ + + easy.reconcile.history.tree + 16 + easy.reconcile.history + tree + + + + + + + + + + Easy Automatic Reconcile History + ir.actions.act_window + easy.reconcile.history + form + tree,form + + + + + + From 3ff89320a18cae980dbbf5c83f4717fe26bb5e9b Mon Sep 17 00:00:00 2001 From: "Guewen Baconnier @ Camptocamp" Date: Wed, 19 Dec 2012 14:07:07 +0100 Subject: [PATCH 04/15] [IMP] create history of reconciliations --- account_easy_reconcile/easy_reconcile.py | 65 ++++++++++++------- .../easy_reconcile_history.py | 10 ++- .../easy_reconcile_history_view.xml | 5 +- 3 files changed, 53 insertions(+), 27 deletions(-) diff --git a/account_easy_reconcile/easy_reconcile.py b/account_easy_reconcile/easy_reconcile.py index 6a2899cd..2637be71 100644 --- a/account_easy_reconcile/easy_reconcile.py +++ b/account_easy_reconcile/easy_reconcile.py @@ -144,7 +144,7 @@ class account_easy_reconcile(Model): 'scheduler': fields.many2one('ir.cron', 'scheduler', readonly=True), 'rec_log': fields.text('log', readonly=True), 'unreconciled_count': fields.function(_get_total_unrec, - type='integer', string='Fully Unreconciled Entries'), + type='integer', string='Unreconciled Entries'), 'reconciled_partial_count': fields.function(_get_partial_rec, type='integer', string='Partially Reconciled Entries'), } @@ -168,39 +168,58 @@ class account_easy_reconcile(Model): 'filter': rec_method.filter} def run_reconcile(self, cr, uid, ids, context=None): + def find_reconcile_ids(fieldname, move_line_ids): + if not move_line_ids: + return [] + sql = ("SELECT DISTINCT " + fieldname + + " FROM account_move_line " + " WHERE id in %s " + " AND " + fieldname + " IS NOT NULL") + cr.execute(sql, (tuple(move_line_ids),)) + res = cr.fetchall() + return [row[0] for row in res] + if context is None: context = {} - for rec_id in ids: - rec = self.browse(cr, uid, rec_id, context=context) - total_rec = 0 - total_partial_rec = 0 - details = [] - count = 0 - for method in rec.reconcile_method: - count += 1 + for rec in self.browse(cr, uid, ids, context=context): + all_ml_rec_ids = [] + all_ml_partial_ids = [] + for method in rec.reconcile_method: rec_model = self.pool.get(method.name) auto_rec_id = rec_model.create( cr, uid, self._prepare_run_transient(cr, uid, method, context=context), context=context) - rec_ids, partial_ids = rec_model.automatic_reconcile( + ml_rec_ids, ml_partial_ids = rec_model.automatic_reconcile( cr, uid, auto_rec_id, context=context) - details.append(_('method %d : full: %d lines, partial: %d lines') % \ - (count, len(rec_ids), len(partial_ids))) + all_ml_rec_ids += ml_rec_ids + all_ml_partial_ids += ml_partial_ids - total_rec += len(rec_ids) - total_partial_rec += len(partial_ids) + reconcile_ids = find_reconcile_ids( + 'reconcile_id', all_ml_rec_ids) + partial_ids = find_reconcile_ids( + 'reconcile_partial_id', all_ml_partial_ids) - log = self.read(cr, uid, rec_id, ['rec_log'], context=context)['rec_log'] - log_lines = log and log.splitlines() or [] - log_lines[0:0] = [_("%s : %d lines have been fully reconciled" \ - " and %d lines have been partially reconciled (%s)") % \ - (time.strftime(DEFAULT_SERVER_DATETIME_FORMAT), total_rec, - total_partial_rec, ' | '.join(details))] - log = "\n".join(log_lines) - self.write(cr, uid, rec_id, {'rec_log': log}, context=context) - return True + history_id = self.pool.get('easy.reconcile.history').create( + cr, + uid, + {'easy_reconcile_id': rec.id, + 'date': fields.datetime.now(), + 'reconcile_ids': [(4, rid) for rid in reconcile_ids], + 'reconcile_partial_ids': [(4, rid) for rid in partial_ids]}, + context=context) + return { + 'name':_("Reconciliations"), + 'view_mode': 'tree,form', # FIXME: In OpenERP 6.1 we can't display + 'view_id': False, # only the form, check in version 7.0 + 'view_type': 'form', + 'res_model': 'easy.reconcile.history', + 'type': 'ir.actions.act_window', + 'nodestroy': True, + 'target': 'current', + 'domain': unicode([('id', '=', history_id)]), + } diff --git a/account_easy_reconcile/easy_reconcile_history.py b/account_easy_reconcile/easy_reconcile_history.py index e37e2c52..251745fa 100644 --- a/account_easy_reconcile/easy_reconcile_history.py +++ b/account_easy_reconcile/easy_reconcile_history.py @@ -27,13 +27,19 @@ class easy_reconcile_history(orm.Model): Each history stores the list of reconciliations done""" _name = 'easy.reconcile.history' + _rec_name = 'easy_reconcile_id' + _order = 'date DESC' _columns = { 'easy_reconcile_id': fields.many2one( 'account.easy.reconcile', 'Reconcile Profile', readonly=True), 'date': fields.datetime('Run date', readonly=True), 'reconcile_ids': fields.many2many( - 'account.move.reconcile', string='Reconciliations', readonly=True), + 'account.move.reconcile', + 'account_move_reconcile_history_rel', + string='Reconciliations', readonly=True), 'reconcile_partial_ids': fields.many2many( - 'account.move.reconcile', string='Partial Reconciliations', readonly=True), + 'account.move.reconcile', + 'account_move_reconcile_history_partial_rel', + string='Partial Reconciliations', readonly=True), } diff --git a/account_easy_reconcile/easy_reconcile_history_view.xml b/account_easy_reconcile/easy_reconcile_history_view.xml index a11edf91..be1a2b57 100644 --- a/account_easy_reconcile/easy_reconcile_history_view.xml +++ b/account_easy_reconcile/easy_reconcile_history_view.xml @@ -20,6 +20,7 @@ + - + easy.reconcile.history.form 16 easy.reconcile.history @@ -46,7 +47,7 @@ - + easy.reconcile.history.tree 16 easy.reconcile.history From 18e08c0e98cacd841af51c4c85b404d0772ea2a0 Mon Sep 17 00:00:00 2001 From: "Guewen Baconnier @ Camptocamp" Date: Wed, 19 Dec 2012 14:11:13 +0100 Subject: [PATCH 05/15] [IMP] remove rec_log column no longer used with an history --- account_easy_reconcile/easy_reconcile.py | 3 +-- account_easy_reconcile/easy_reconcile.xml | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/account_easy_reconcile/easy_reconcile.py b/account_easy_reconcile/easy_reconcile.py index 2637be71..e093f8d8 100644 --- a/account_easy_reconcile/easy_reconcile.py +++ b/account_easy_reconcile/easy_reconcile.py @@ -142,7 +142,6 @@ class account_easy_reconcile(Model): 'account': fields.many2one('account.account', 'Account', required=True), 'reconcile_method': fields.one2many('account.easy.reconcile.method', 'task_id', 'Method'), 'scheduler': fields.many2one('ir.cron', 'scheduler', readonly=True), - 'rec_log': fields.text('log', readonly=True), 'unreconciled_count': fields.function(_get_total_unrec, type='integer', string='Unreconciled Entries'), 'reconciled_partial_count': fields.function(_get_partial_rec, @@ -152,7 +151,7 @@ class account_easy_reconcile(Model): def copy_data(self, cr, uid, id, default=None, context=None): if default is None: default = {} - default = dict(default, rec_log=False, scheduler=False) + default = dict(default, scheduler=False) return super(account_easy_reconcile, self).copy_data( cr, uid, id, default=default, context=context) diff --git a/account_easy_reconcile/easy_reconcile.xml b/account_easy_reconcile/easy_reconcile.xml index 1bd84c66..e26e785c 100644 --- a/account_easy_reconcile/easy_reconcile.xml +++ b/account_easy_reconcile/easy_reconcile.xml @@ -33,8 +33,6 @@ The lines should have the same amount (with the write-off) and the same partner