diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 3da8436a1da..5b06a40acb1 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -482,7 +482,7 @@ account.invoice form tree,form,calendar,graph - [('state','!=','draft'),('reconciled','=',False),('type','=','out_invoice')] + [('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_invoice')] {'type':'out_invoice'} @@ -526,7 +526,7 @@ account.invoice form tree,form,calendar,graph - [('state','!=','draft'),('reconciled','=',False),('type','=','in_invoice')] + [('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','in_invoice')] {'type':'in_invoice'} @@ -570,7 +570,7 @@ account.invoice form tree,form,calendar,graph - [('state','!=','draft'),('reconciled','=',False),('type','=','out_refund')] + [('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_refund')] {'type':'out_refund'} @@ -614,7 +614,7 @@ account.invoice form tree,form,calendar,graph - [('state','!=','draft'),('reconciled','=',False),('type','=','in_refund')] + [('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','in_refund')] {'type':'in_refund'} diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 902fe5523bb..c2d474a3441 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -573,7 +573,7 @@ class account_move_line(osv.osv): raise osv.except_osv(_('Error'), _('Entry is already reconciled')) account = self.pool.get('account.account').browse(cr, uid, account_id, context=context) if not context.get('fy_closing', False) and not account.reconcile: - raise osv.except_osv(_('Error'), _('The account is not defined to be reconcile !')) + raise osv.except_osv(_('Error'), _('The account is not defined to be reconciled !')) if r[0][1] != None: raise osv.except_osv(_('Error'), _('Some entries are already reconciled !')) @@ -837,7 +837,7 @@ class account_move_line(osv.osv): if journal.type_control_ids: type = account.user_type for t in journal.type_control_ids: - if type==t.code: + if type.code == t.code: ok = True break if journal.account_control_ids and not ok: diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index ebb0c4ff0cd..60ca4626033 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -845,7 +845,8 @@ - + + diff --git a/addons/account/i18n/fr_FR.po b/addons/account/i18n/fr_FR.po index 3fa59da7dcd..12f57f2f421 100644 --- a/addons/account/i18n/fr_FR.po +++ b/addons/account/i18n/fr_FR.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-05-19 14:36+0000\n" -"PO-Revision-Date: 2009-06-05 12:12+0000\n" -"Last-Translator: Olivier (OpenERP) \n" +"PO-Revision-Date: 2009-06-12 11:04+0000\n" +"Last-Translator: Olivier (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-06-05 12:16+0000\n" +"X-Launchpad-Export-Date: 2009-07-07 11:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -103,7 +103,7 @@ msgstr "Résultat du lettrage" #. module: account #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled msgid "Unreconciled entries" -msgstr "Écritures non réconciliées" +msgstr "Ecritures non-lettrées" #. module: account #: field:account.invoice.tax,base_code_id:0 @@ -151,7 +151,7 @@ msgstr "Coefficient multiplicateur" #: model:ir.actions.wizard,name:account.wizard_unreconcile_select #: model:ir.ui.menu,name:account.menu_unreconcile_select msgid "Unreconcile entries" -msgstr "Écritures non réconciliées" +msgstr "Ecritures non-lettrées" #. module: account #: constraint:account.period:0 @@ -224,7 +224,7 @@ msgid "" "You should set the journal to allow cancelling entries if you want to do " "that." msgstr "" -"Vous ne pouvez pas modifier une écriture postée dans ce journal !\n" +"Vous ne pouvez pas modifier une entrée postée dans ce journal !\n" "Vous devez modifier le journal pour permettre l'annulation des écritures si " "vous voulez permettre cela." @@ -271,7 +271,7 @@ msgstr "Echéancier" #. module: account #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries msgid "Recurrent Entries" -msgstr "Écritures réccurentes" +msgstr "Ecritures réccurentes" #. module: account #: field:account.analytic.line,amount:0 @@ -774,7 +774,7 @@ msgstr "Remise (%)" #: code:addons/account/account_move_line.py:0 #, python-format msgid "You can not add/modify entries in a closed journal." -msgstr "Vous ne pouvez pas ajouter/modifier les écritures dans un journal cloturé." +msgstr "Vous ne pouvez pas ajouter/modifier un journal cloturé." #. module: account #: code:addons/account/account_move_line.py:0 @@ -1154,7 +1154,7 @@ msgstr "Compte de débit par défaut" #: model:ir.actions.act_window,name:account.action_bank_statement_tree #: model:ir.ui.menu,name:account.menu_bank_statement_tree msgid "Entries by Statements" -msgstr "Écritures par état" +msgstr "Ecritures par état" #. module: account #: model:process.transition,name:account.process_transition_analyticinvoice0 @@ -1336,7 +1336,7 @@ msgstr "Prix unitaire" #. module: account #: model:ir.actions.wizard,name:account.action_move_journal_line_form_select msgid "Standard entry" -msgstr "Écriture standard" +msgstr "Entrée standard" #. module: account #: model:ir.model,name:account.model_wizard_multi_charts_accounts @@ -1609,7 +1609,7 @@ msgstr "Séquences" #. module: account #: wizard_button:account.subscription.generate,init,generate:0 msgid "Compute Entry Dates" -msgstr "Calculer les dates d'Écriture" +msgstr "Calculer les dates d'entrée" #. module: account #: code:addons/account/invoice.py:0 @@ -1958,7 +1958,7 @@ msgstr "Delta de crédit" #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile #: model:ir.actions.wizard,name:account.wizard_unreconcile msgid "Unreconcile Entries" -msgstr "Écritures non réconciliées" +msgstr "Écritures non lettrées" #. module: account #: model:process.node,note:account.process_node_supplierdraftinvoices0 @@ -2425,7 +2425,7 @@ msgstr "Montant" #. module: account #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open msgid "Reconciled entries" -msgstr "Écritures réconciliées" +msgstr "Ecritures lettrées" #. module: account #: field:account.invoice,address_contact_id:0 @@ -2629,7 +2629,7 @@ msgstr "Type de Taxe" #. module: account #: model:process.transition,name:account.process_transition_statemententries0 msgid "Statement Entries" -msgstr "Écritures du relevé" +msgstr "Entrées du relevé" #. module: account #: code:addons/account/wizard/wizard_fiscalyear_close.py:0 @@ -2673,7 +2673,7 @@ msgstr "Importer une facture" #: code:addons/account/account_move_line.py:0 #, python-format msgid "Some entries are already reconciled !" -msgstr "Des écritures semblent déjà réconciliées !" +msgstr "Des écritures semblent déjà lettrées !" #. module: account #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0 @@ -2809,7 +2809,7 @@ msgstr "Informations supplémentaires" #: model:process.transition,name:account.process_transition_entriesreconcile0 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0 msgid "Entries Reconcile" -msgstr "Écritures réconciliées" +msgstr "Ecritures lettrées" #. module: account #: help:account.bank.statement.reconcile,total_second_amount:0 @@ -2944,7 +2944,7 @@ msgstr "Ordre de Paiement" msgid "" "Check this option if you want the user to reconcile entries in this account." msgstr "" -"Cochez cette case si vous voulez que l'utilisateur réconcilie les Écritures " +"Cochez cette case si vous voulez que l'utilisateur réconcilie les entrées " "dans ce compte." #. module: account @@ -2997,7 +2997,7 @@ msgid "" "accounts." msgstr "" "Ce type est utilisé pour différencier les types qui ont un effet spécial " -"dans Open ERP: les \"vues\" ne peuvent pas posséder d'écriture, " +"dans Open ERP: les \"vues\" ne peuvent pas posséder d'entrées, " "\"consolidation\" veut dire les comptes qui peuvent avoir des comptes fils " "pour les consolidations des multi-sociétés, payable/recevable sont pour les " "comptes partenaire (pour le calcul des débits/crédits), \"fermé\" pour les " @@ -3240,7 +3240,7 @@ msgstr "Compte de taxe" #. module: account #: model:process.transition,note:account.process_transition_statemententries0 msgid "From statement, create entries" -msgstr "Depuis le relevé, créer des Écritures" +msgstr "Depuis le relevé, créer des entrées" #. module: account #: field:account.analytic.account,complete_name:0 @@ -3393,8 +3393,8 @@ msgid "" "between the date of the creation action or the the date of the creation of " "the entries plus the partner payment terms." msgstr "" -"La date d'échéance de l'écriture générée pour ce modèle. Vous pouvez choisir " -"entre la date de création de l'action ou la date de création des écritures " +"La date d'échéance de l'entrée générée pour ce modèle. Vous pouvez choisir " +"entre la date de création de l'action ou la date de création des entrées " "plus les conditions de règlement du partenaire." #. module: account @@ -3421,7 +3421,7 @@ msgstr "Document" #. module: account #: help:account.move.line,move_id:0 msgid "The move of this entry line." -msgstr "Le mouvement de cette ligne d'écriture." +msgstr "Le mouvement de cette ligne d'entrée." #. module: account #: field:account.invoice.line,uos_id:0 @@ -3882,7 +3882,7 @@ msgid "" "All draft account entries in this journal and period will be validated. It " "means you won't be able to modify their accouting fields." msgstr "" -"Toutes les écritures de comptes brouillon dans ce journal et cette période " +"Toutes les entrées de comptes brouillon dans ce journal et cette période " "seront validées. Cela veut dire que vous ne pourrez plus modifier leurs " "champs de compte." @@ -3898,7 +3898,7 @@ msgid "" "The amount expressed in an optional other currency if it is a multi-currency " "entry." msgstr "" -"Le montant exprimé dans une autre devise optionnelle si c'est une écriture " +"Le montant exprimé dans une autre devise optionnelle si c'est une entrée " "multi devise." #. module: account @@ -4161,7 +4161,7 @@ msgstr "" #: code:addons/account/invoice.py:0 #, python-format msgid "Global taxes defined, but are not in invoice lines !" -msgstr "Taxes globales définies, mais elles ne sont pas dans les lignes de facture !" +msgstr "" #. module: account #: selection:account.config.wizard,period:0 @@ -4234,7 +4234,7 @@ msgstr "Date de facture" #: code:addons/account/wizard/wizard_fiscalyear_close.py:0 #, python-format msgid "The old fiscal year does not have any entry to reconcile!" -msgstr "L'ancienne année fiscale n'a pas d'écriture à réconcilier !" +msgstr "L'ancienne année fiscale n'a pas d'entrées à réconcilier !" #. module: account #: code:addons/account/wizard/wizard_fiscalyear_close.py:0 @@ -4565,7 +4565,7 @@ msgid "" "You can check this box to mark the entry line as a litigation with the " "associated partner" msgstr "" -"Vous pouvez cocher cette boîte pour marquer la ligne d'écriture comme un " +"Vous pouvez cocher cette boîte pour marquer la ligne d'entrée comme un " "litige avec le partenaire associé" #. module: account @@ -4713,7 +4713,7 @@ msgid "" "date for the payment of this entry line." msgstr "" "Ce champ est utilisé pour les écritures à payer et à recevoir. Vous pouvez " -"mettre la date limite pour le règlement de cette ligne d'écriture." +"mettre la date limite pour le règlement de cette ligne d'entrée." #. module: account #: rml:account.tax.code.entries:0 @@ -4942,7 +4942,7 @@ msgstr "Modèle de compte de taxe" #. module: account #: help:account.model,name:0 msgid "This is a model for recurring accounting entries" -msgstr "Ceci est un modèle pour des écritures comptable récurrentes" +msgstr "Ceci est un modèle pour des entrées comptable récurrentes" #. module: account #: wizard_view:account.wizard_paid_open,init:0 @@ -4967,7 +4967,7 @@ msgstr "Débit fournisseur" #. module: account #: help:account.model.line,quantity:0 msgid "The optional quantity on entries" -msgstr "La quantité optionelle des écritures" +msgstr "La quantité optionelle des entrées" #. module: account #: rml:account.third_party_ledger:0 @@ -5122,13 +5122,13 @@ msgstr "La taxe est comprise dans le prix indiqué" #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree2 #: model:ir.ui.menu,name:account.account_analytic_journal_entries msgid "Analytic Entries by Journal" -msgstr "Écritures analytiques par journal" +msgstr "Entrées analytiques par journal" #. module: account #: model:process.transition,note:account.process_transition_suppliervalidentries0 #: model:process.transition,note:account.process_transition_validentries0 msgid "Valid entries from invoice" -msgstr "Écritures valides de la Facture" +msgstr "Entrées valides de la Facture" #. module: account #: field:account.account,company_id:0 @@ -5298,7 +5298,7 @@ msgstr "Adresse de facturation" #. module: account #: rml:account.analytic.account.analytic.check:0 msgid "General Credit" -msgstr "Crédit Général" +msgstr "" #. module: account #: code:addons/account/invoice.py:0 @@ -5317,7 +5317,7 @@ msgid "" "new counterpart but will share the same counterpart. This is used in fiscal " "year closing." msgstr "" -"Cochez cette case pour spécifier que chaque écriture de ce journal ne créera " +"Cochez cette case pour spécifier que chaque entrée de ce journal ne créera " "pas une nouvelle contrepartie mais partagera la même contrepartie. Cela est " "utilisé dans la clôture des années fiscales." @@ -5546,7 +5546,7 @@ msgstr "Début de la Période" #. module: account #: wizard_field:account.fiscalyear.close,init,report_name:0 msgid "Name of new entries" -msgstr "Nom des nouvelles écritures" +msgstr "Nom des nouvelles entrées" #. module: account #: wizard_button:account_use_models,init_form,create:0 @@ -5818,7 +5818,7 @@ msgstr "Cette période est déjà cloturée !" #. module: account #: help:account.move.line,currency_id:0 msgid "The optional other currency if it is a multi-currency entry." -msgstr "L'autre devise optionelle si c'est une écriture multi devise." +msgstr "L'autre devise optionelle si c'est une entrée multi devise." #. module: account #: view:account.invoice:0 @@ -5858,7 +5858,7 @@ msgstr "Non" #. module: account #: model:ir.actions.act_window,name:account.act_account_partner_account_move msgid "All account entries" -msgstr "Toutes les écritures de compte" +msgstr "Toutes les entrées de compte" #. module: account #: help:account.invoice.tax,tax_code_id:0 @@ -5927,7 +5927,7 @@ msgstr "PRO-FORMA" #. module: account #: field:account.move.reconcile,line_partial_ids:0 msgid "Partial Entry lines" -msgstr "Lignes d'Écriture Partielle" +msgstr "Lignes d'Entrée Partielle" #. module: account #: help:account.move.line,statement_id:0 @@ -5948,7 +5948,7 @@ msgstr "Encodage standard" #. module: account #: wizard_button:account.analytic.line,init,open:0 msgid "Open Entries" -msgstr "Écritures Ouvertes" +msgstr "Entrées Ouvertes" #. module: account #: code:addons/account/account_move_line.py:0 @@ -6154,7 +6154,7 @@ msgstr "Définition du Journal Analytique" #. module: account #: field:account.journal,entry_posted:0 msgid "Skip 'Draft' State for Created Entries" -msgstr "Omettre l'état 'Brouillon' pour les Écritures Créées" +msgstr "Omettre l'état 'Brouillon' pour les Entrées Créées" #. module: account #: model:ir.model,name:account.model_account_tax_template @@ -6253,7 +6253,7 @@ msgstr "Vous devez définir un journal analytique sur le journal '%s' !" #. module: account #: wizard_view:account.move.validate,init:0 msgid "Validate Account Entries" -msgstr "Valider les Écritures du Compte" +msgstr "Valider les Entrées du Compte" #. module: account #: selection:account.print.journal.report,init,sort_selection:0 @@ -6274,7 +6274,7 @@ msgstr "au" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form msgid "Entries of Open Analytic Journals" -msgstr "Écritures des Journaux Analytiques Ouverts" +msgstr "Entrées des Journaux Analytiques Ouverts" #. module: account #: view:account.invoice.tax:0 @@ -6459,7 +6459,7 @@ msgstr "account.sequence.fiscalyear" #. module: account #: wizard_field:account.print.journal.report,init,sort_selection:0 msgid "Entries Sorted By" -msgstr "Écritures triées par" +msgstr "Entrées triées par" #. module: account #: rml:account.journal.period.print:0 @@ -6531,12 +6531,12 @@ msgstr "Note de Crédit Fournisseur" #: model:process.transition,note:account.process_transition_entriesreconcile0 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0 msgid "Reconcile Entries." -msgstr "Réconcilier les Écritures." +msgstr "Réconcilier les Entrées." #. module: account #: field:account.subscription.line,move_id:0 msgid "Entry" -msgstr "Écriture" +msgstr "Entrée" #. module: account #: model:process.node,note:account.process_node_paidinvoice0 @@ -6591,12 +6591,12 @@ msgstr "Détails de banque" #. module: account #: field:account.chart.template,property_account_expense:0 msgid "Expense Account on Product Template" -msgstr "Compte de Dépense sur les Modèles de Produits" +msgstr "" #. module: account #: rml:account.analytic.account.analytic.check:0 msgid "General Debit" -msgstr "Débit Général" +msgstr "" #. module: account #: field:account.analytic.account,code:0 @@ -6692,7 +6692,7 @@ msgstr "Oui" msgid "" "Check this if the user is allowed to reconcile entries in this account." msgstr "" -"Cochez cette case si l'utilisateur peut réconcilier les Écritures dans ce " +"Cochez cette case si l'utilisateur peut réconcilier les entrées dans ce " "compte." #. module: account diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 2bbd2e92207..9814214786a 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -772,7 +772,7 @@ class account_invoice(osv.osv): ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context) return self.name_get(cr, user, ids, context) - def _refund_cleanup_lines(self, lines): + def _refund_cleanup_lines(self, cr, uid, lines): for line in lines: del line['id'] del line['invoice_id'] @@ -810,11 +810,11 @@ class account_invoice(osv.osv): invoice_lines = self.pool.get('account.invoice.line').read(cr, uid, invoice['invoice_line']) - invoice_lines = self._refund_cleanup_lines(invoice_lines) + invoice_lines = self._refund_cleanup_lines(cr, uid, invoice_lines) tax_lines = self.pool.get('account.invoice.tax').read(cr, uid, invoice['tax_line']) tax_lines = filter(lambda l: l['manual'], tax_lines) - tax_lines = self._refund_cleanup_lines(tax_lines) + tax_lines = self._refund_cleanup_lines(cr, uid, tax_lines) if not date : date = time.strftime('%Y-%m-%d') invoice.update({ @@ -880,7 +880,7 @@ class account_invoice(osv.osv): lines = [(0, 0, l1), (0, 0, l2)] move = {'ref': invoice.number, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date} - move_id = self.pool.get('account.move').create(cr, uid, move) + move_id = self.pool.get('account.move').create(cr, uid, move, context=context) line_ids = [] total = 0.0 diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index 7fea81087aa..5dce667920e 100644 --- a/addons/account/security/ir.model.access.csv +++ b/addons/account/security/ir.model.access.csv @@ -86,3 +86,6 @@ "access_account_fiscal_position_account_template","account.fiscal.position.account.template","model_account_fiscal_position_account_template","account.group_account_manager",1,1,1,1 "access_account_sequence_fiscal_year","account.sequence.fiscalyear","model_account_sequence_fiscalyear","account.group_account_user",1,1,1,1 "access_account_sequence_fiscal_year_user","account.sequence.fiscalyear user","model_account_sequence_fiscalyear","base.group_user",1,0,0,0 +"access_wizard_company_setup_manager","wizard.company.setup manager","model_wizard_company_setup","account.group_account_manager",1,1,1,1 +"access_wizard_company_setup","wizard.company.setup","model_wizard_company_setup","account.group_account_user",1,0,0,0 +"access_wizard_company_setup_user","wizard.company.setup user","model_wizard_company_setup","base.group_user",1,0,0,0 diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 4350f0a42b8..30c6f98d6a2 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -35,7 +35,7 @@ class account_analytic_account(osv.osv): ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)]) if ids2: acc_set = ",".join(map(str, ids2)) - cr.execute("select account_analytic_line.account_id, sum(amount) \ + cr.execute("select account_analytic_line.account_id, COALESCE(sum(amount),0.0) \ from account_analytic_line \ join account_analytic_journal \ on account_analytic_line.journal_id = account_analytic_journal.id \ @@ -62,9 +62,9 @@ class account_analytic_account(osv.osv): # Amount uninvoiced hours to invoice at sale price acc_set = ",".join(map(str, ids2)) cr.execute("""SELECT account_analytic_account.id, \ - sum (product_template.list_price * \ + COALESCE(sum (product_template.list_price * \ account_analytic_line.unit_amount * \ - ((100-hr_timesheet_invoice_factor.factor)/100)) \ + ((100-hr_timesheet_invoice_factor.factor)/100)),0.0) \ AS ca_to_invoice \ FROM product_template \ join product_product \ @@ -114,7 +114,7 @@ class account_analytic_account(osv.osv): ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)]) if ids2: acc_set = ",".join(map(str, ids2)) - cr.execute("select account_analytic_line.account_id, sum(unit_amount) \ + cr.execute("select account_analytic_line.account_id, COALESCE(sum(unit_amount),0.0) \ from account_analytic_line \ join account_analytic_journal \ on account_analytic_line.journal_id = account_analytic_journal.id \ @@ -140,14 +140,15 @@ class account_analytic_account(osv.osv): ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)]) if ids2: acc_set = ",".join(map(str, ids2)) - cr.execute("select account_analytic_line.account_id,sum(unit_amount) \ + cr.execute("select account_analytic_line.account_id,COALESCE(SUM(unit_amount),0.0) \ from account_analytic_line \ join account_analytic_journal \ on account_analytic_line.journal_id = account_analytic_journal.id \ where account_analytic_line.account_id IN (%s) \ and account_analytic_journal.type='general' \ GROUP BY account_analytic_line.account_id"%acc_set) - for account_id, sum in cr.fetchall(): + ff = cr.fetchall() + for account_id, sum in ff: res[account_id] = round(sum,2) for obj_id in ids: res.setdefault(obj_id, 0.0) @@ -164,7 +165,7 @@ class account_analytic_account(osv.osv): ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)]) if ids2: acc_set = ",".join(map(str, ids2)) - cr.execute("""select account_analytic_line.account_id,sum(amount) \ + cr.execute("""select account_analytic_line.account_id,COALESCE(sum(amount),0.0) \ from account_analytic_line \ join account_analytic_journal \ on account_analytic_line.journal_id = account_analytic_journal.id \ @@ -190,9 +191,9 @@ class account_analytic_account(osv.osv): if ids2: acc_set = ",".join(map(str, ids2)) cr.execute("""select account_analytic_line.account_id as account_id, \ - sum((account_analytic_line.unit_amount * pt.list_price) \ + COALESCE(sum((account_analytic_line.unit_amount * pt.list_price) \ - (account_analytic_line.unit_amount * pt.list_price \ - * hr.factor)) as somme + * hr.factor)),0.0) as somme from account_analytic_line \ left join account_analytic_journal \ on (account_analytic_line.journal_id = account_analytic_journal.id) \ @@ -584,7 +585,7 @@ class account_analytic_account_summary_month(osv.osv): _description = "Hours summary by month" _auto = False _rec_name = 'month' - _order = 'month' +# _order = 'month' def _unit_amount(self, cr, uid, ids, name, arg, context=None): res = {} diff --git a/addons/account_analytic_analysis/i18n/fr_FR.po b/addons/account_analytic_analysis/i18n/fr_FR.po index 7e8c4ca7d3c..94baf4c1325 100644 --- a/addons/account_analytic_analysis/i18n/fr_FR.po +++ b/addons/account_analytic_analysis/i18n/fr_FR.po @@ -8,12 +8,12 @@ msgstr "" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-05-19 14:36+0000\n" "PO-Revision-Date: 2009-06-12 10:58+0000\n" -"Last-Translator: Olivier (OpenERP) \n" +"Last-Translator: Olivier (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-06-12 11:04+0000\n" +"X-Launchpad-Export-Date: 2009-07-07 11:16+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis diff --git a/addons/account_analytic_default/i18n/fr_FR.po b/addons/account_analytic_default/i18n/fr_FR.po index 9e725596de8..888dad55230 100644 --- a/addons/account_analytic_default/i18n/fr_FR.po +++ b/addons/account_analytic_default/i18n/fr_FR.po @@ -8,12 +8,12 @@ msgstr "" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-05-19 14:36+0000\n" "PO-Revision-Date: 2009-06-12 11:00+0000\n" -"Last-Translator: Olivier (OpenERP) \n" +"Last-Translator: Olivier (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-06-12 11:08+0000\n" +"X-Launchpad-Export-Date: 2009-07-07 11:20+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_default diff --git a/addons/account_analytic_plans/i18n/fr_FR.po b/addons/account_analytic_plans/i18n/fr_FR.po index 2905868e4ed..0229707a14e 100644 --- a/addons/account_analytic_plans/i18n/fr_FR.po +++ b/addons/account_analytic_plans/i18n/fr_FR.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-05-19 14:36+0000\n" -"PO-Revision-Date: 2009-06-12 12:32+0000\n" -"Last-Translator: Olivier (OpenERP) \n" +"PO-Revision-Date: 2009-07-07 07:24+0000\n" +"Last-Translator: Olivier (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-06-12 12:48+0000\n" +"X-Launchpad-Export-Date: 2009-07-07 11:17+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_plans @@ -315,7 +315,7 @@ msgstr "" #. module: account_analytic_plans #: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information msgid "Multiple-plans management in Analytic Accounting" -msgstr "Gestion de plusieurs plans dans la comptabilité analytique" +msgstr "Gestion de plans multiples dans la comptabilité analytique" #. module: account_analytic_plans #: view:account.analytic.plan.line:0 diff --git a/addons/account_balance/i18n/fr_FR.po b/addons/account_balance/i18n/fr_FR.po index d5d563ecbdc..93a58425a22 100644 --- a/addons/account_balance/i18n/fr_FR.po +++ b/addons/account_balance/i18n/fr_FR.po @@ -8,12 +8,12 @@ msgstr "" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-05-19 14:36+0000\n" "PO-Revision-Date: 2009-06-12 11:29+0000\n" -"Last-Translator: Olivier (OpenERP) \n" +"Last-Translator: Olivier (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-06-12 11:36+0000\n" +"X-Launchpad-Export-Date: 2009-07-07 11:14+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_balance diff --git a/addons/account_budget/i18n/fr_FR.po b/addons/account_budget/i18n/fr_FR.po index ad2abbb9352..2526effa031 100644 --- a/addons/account_budget/i18n/fr_FR.po +++ b/addons/account_budget/i18n/fr_FR.po @@ -8,12 +8,12 @@ msgstr "" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-05-19 14:36+0000\n" "PO-Revision-Date: 2009-06-12 11:10+0000\n" -"Last-Translator: Olivier (OpenERP) \n" +"Last-Translator: Olivier (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-06-12 11:20+0000\n" +"X-Launchpad-Export-Date: 2009-07-07 11:09+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_budget diff --git a/addons/account_chart/i18n/fr_FR.po b/addons/account_chart/i18n/fr_FR.po index 793e6bafba2..8832ddedab7 100644 --- a/addons/account_chart/i18n/fr_FR.po +++ b/addons/account_chart/i18n/fr_FR.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-04-09 17:23+0000\n" -"PO-Revision-Date: 2009-07-06 13:02+0000\n" -"Last-Translator: Olivier (OpenERP) \n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-06-12 13:12+0000\n" +"Last-Translator: Olivier (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-07-06 13:16+0000\n" +"X-Launchpad-Export-Date: 2009-07-07 11:22+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_chart diff --git a/addons/account_date_check/i18n/fr_FR.po b/addons/account_date_check/i18n/fr_FR.po index f59cf066c15..8f6d4fd939c 100644 --- a/addons/account_date_check/i18n/fr_FR.po +++ b/addons/account_date_check/i18n/fr_FR.po @@ -8,12 +8,12 @@ msgstr "" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-05-19 14:36+0000\n" "PO-Revision-Date: 2009-06-12 13:15+0000\n" -"Last-Translator: Olivier (OpenERP) \n" +"Last-Translator: Olivier (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-06-12 13:28+0000\n" +"X-Launchpad-Export-Date: 2009-07-07 11:18+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_date_check diff --git a/addons/account_followup/i18n/fr_FR.po b/addons/account_followup/i18n/fr_FR.po index 34add298c89..c2ef6a3df35 100644 --- a/addons/account_followup/i18n/fr_FR.po +++ b/addons/account_followup/i18n/fr_FR.po @@ -6,19 +6,20 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-19 14:22:20+0000\n" -"PO-Revision-Date: 2009-05-20 10:22:20+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-06-12 13:18+0000\n" +"Last-Translator: Olivier (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-07-07 11:11+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: account_followup #: rml:account_followup.followup.print:0 msgid "Date :" -msgstr "" +msgstr "Date :" #. module: account_followup #: wizard_field:account_followup.followup.print.all,next,partner_ids:0 @@ -28,7 +29,7 @@ msgstr "Partenaires" #. module: account_followup #: rml:account_followup.followup.print:0 msgid "Customer Ref :" -msgstr "" +msgstr "Réf. Client" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all @@ -39,7 +40,7 @@ msgstr "Toutes les entrées payables" #. module: account_followup #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nom du Modèle non valide dans la définition de l'action." #. module: account_followup #: field:account_followup.followup.line,description:0 @@ -54,7 +55,7 @@ msgstr "Total débit" #. module: account_followup #: rml:account_followup.followup.print:0 msgid "Amount In Currency" -msgstr "" +msgstr "Montant en Devise" #. module: account_followup #: rml:account_followup.followup.print:0 @@ -86,13 +87,18 @@ msgstr "Débit" #. module: account_followup #: code:addons/account_followup/wizard/wizard_followup_print.py:0 #, python-format -msgid "Mail not sent to following Partners, Email not available !\n\n" +msgid "" +"Mail not sent to following Partners, Email not available !\n" +"\n" msgstr "" +"Un courriel n'a pas été envoyé aux Partenaires suivants, l'adresse n'est pas " +"disponible !\n" +"\n" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "Email Settings" -msgstr "" +msgstr "Paramètres du Courriel" #. module: account_followup #: field:account_followup.stat,account_type:0 @@ -118,8 +124,16 @@ msgstr "%(date)s: Date Courante" #. module: account_followup #: code:addons/account_followup/wizard/wizard_followup_print.py:0 #, python-format -msgid "\n\nMail sent to following Partners successfully, !\n\n" +msgid "" +"\n" +"\n" +"Mail sent to following Partners successfully, !\n" +"\n" msgstr "" +"\n" +"\n" +"Courriel envoyé avec succès aux Partenaires suivants,\n" +"\n" #. module: account_followup #: field:account.move.line,followup_date:0 @@ -135,7 +149,7 @@ msgstr "Suivis" #. module: account_followup #: wizard_field:account_followup.followup.print.all,init,date:0 msgid "Follow-up Sending Date" -msgstr "" +msgstr "Date d'envoi de la Relance" #. module: account_followup #: view:account_followup.followup:0 @@ -162,7 +176,7 @@ msgstr "Entreprise" #. module: account_followup #: rml:account_followup.followup.print:0 msgid "Invoice Date" -msgstr "" +msgstr "Date de Facturation" #. module: account_followup #: wizard_field:account_followup.followup.print.all,next,email_subject:0 @@ -176,8 +190,11 @@ msgstr "Payé" #. module: account_followup #: constraint:ir.model:0 -msgid "The Object name must start with x_ and not contain any special character !" -msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !" +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères " +"spéciaux !" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 @@ -202,7 +219,7 @@ msgstr "Critère de relance" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "Partner Selection" -msgstr "" +msgstr "Sélection d'un Partenaire" #. module: account_followup #: constraint:ir.ui.view:0 @@ -217,7 +234,7 @@ msgstr "Type de terme" #. module: account_followup #: wizard_view:account_followup.followup.print.all,init:0 msgid "Follow-up and Date Selection" -msgstr "" +msgstr "Sélection de la Relance et de la Date" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 @@ -231,21 +248,26 @@ msgstr "Lit." #. module: account_followup #: model:account_followup.followup.line,description:account_followup.demo_followup_line1 -msgid "\n" +msgid "" +"\n" "Dear %(partner_name)s,\n" "\n" -"Exception made if there was a mistake of ours, it seems that the following amount staid unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.\n" +"Exception made if there was a mistake of ours, it seems that the following " +"amount staid unpaid. Please, take appropriate measures in order to carry out " +"this payment in the next 8 days.\n" "\n" -"Would your payment have been carried out after this mail was sent, please consider the present one as void. Do not hesitate to contact our accounting department at (+32).10.68.94.39.\n" +"Would your payment have been carried out after this mail was sent, please " +"consider the present one as void. Do not hesitate to contact our accounting " +"department at (+32).10.68.94.39.\n" "\n" "Best Regards,\n" -" " +"\t\t\t" msgstr "" #. module: account_followup #: wizard_button:account_followup.followup.print.all,summary,end:0 msgid "Ok" -msgstr "" +msgstr "Ok" #. module: account_followup #: field:account_followup.followup,name:0 @@ -267,7 +289,7 @@ msgstr "Fin de mois" #: view:account_followup.followup.line:0 #: wizard_view:account_followup.followup.print.all,next:0 msgid "%(company_name)s: User's Company name" -msgstr "" +msgstr "%(company_name)s: nom de la société de l'utilisateur" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all @@ -309,18 +331,18 @@ msgstr "Continuer" #. module: account_followup #: model:ir.module.module,shortdesc:account_followup.module_meta_information msgid "Accounting follow-ups management" -msgstr "" +msgstr "Gestion des Relances Comptables" #. module: account_followup #: wizard_view:account_followup.followup.print.all,summary:0 #: wizard_field:account_followup.followup.print.all,summary,summary:0 msgid "Summary" -msgstr "" +msgstr "Résumé" #. module: account_followup #: view:account_followup.followup.line:0 msgid "Follow-Up Lines" -msgstr "" +msgstr "Lignes de Relances" #. module: account_followup #: rml:account_followup.followup.print:0 @@ -335,7 +357,7 @@ msgstr "Lignes de rappel" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "%(company_currency)s: User's Company Currency" -msgstr "" +msgstr "%(company_currency)s: Devise de la société de l'utilisateur" #. module: account_followup #: field:account_followup.stat,balance:0 @@ -344,8 +366,10 @@ msgstr "Balance" #. module: account_followup #: help:account_followup.followup.print.all,init,date:0 -msgid "This field allow you to select a forecast date to plan your follow-ups" +msgid "" +"This field allow you to select a forecast date to plan your follow-ups" msgstr "" +"Ce champ vous permet de sélectionner une date pour planifier vos relances" #. module: account_followup #: view:account.move.line:0 @@ -354,20 +378,27 @@ msgstr "Total crédit" #. module: account_followup #: model:account_followup.followup.line,description:account_followup.demo_followup_line2 -msgid "\n" +msgid "" +"\n" "Dear %(partner_name)s,\n" "\n" -"We are disappointed to see that despite sending a reminder, that your account is now seriously overdue.\n" +"We are disappointed to see that despite sending a reminder, that your " +"account is now seriously overdue.\n" "\n" -"It is essential that immediate payment is made, otherwise we will have to consider placing a stop on your account which means that we will no longer be able to supply your company with (goods/services).\n" -"Please, take appropriate measures in order to carry out this payment in the next 8 days\n" +"It is essential that immediate payment is made, otherwise we will have to " +"consider placing a stop on your account which means that we will no longer " +"be able to supply your company with (goods/services).\n" +"Please, take appropriate measures in order to carry out this payment in the " +"next 8 days\n" "\n" -"If there is a problem with paying invoice that we are not aware of, do not hesitate to contact our accounting department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n" +"If there is a problem with paying invoice that we are not aware of, do not " +"hesitate to contact our accounting department at (+32).10.68.94.39. so that " +"we can resolve the matter quickly.\n" "\n" "Details of due payments is printed below.\n" "\n" "Best Regards,\n" -" " +"\t\t\t" msgstr "" #. module: account_followup @@ -412,25 +443,29 @@ msgstr "Rapport des Relances" #. module: account_followup #: model:account_followup.followup.line,description:account_followup.demo_followup_line3 -msgid "\n" +msgid "" +"\n" "Dear %(partner_name)s,\n" "\n" "Despite several reminders, your account is still not settled.\n" "\n" -"Unless full payment is made in next 8 days , then legal action for the recovery of the debt, will be taken without further notice.\n" +"Unless full payment is made in next 8 days , then legal action for the " +"recovery of the debt, will be taken without further notice.\n" "\n" -"I trust that this action will prove unnecessary and details of due payments is printed below.\n" +"I trust that this action will prove unnecessary and details of due payments " +"is printed below.\n" "\n" -"In case of any queries concerning this matter, do not hesitate to contact our accounting department at (+32).10.68.94.39.\n" +"In case of any queries concerning this matter, do not hesitate to contact " +"our accounting department at (+32).10.68.94.39.\n" "\n" "Best Regards,\n" -" " +"\t\t\t" msgstr "" #. module: account_followup #: rml:account_followup.followup.print:0 msgid "Maturity Date" -msgstr "" +msgstr "Date de Maturité" #. module: account_followup #: view:account_followup.followup.line:0 @@ -462,7 +497,7 @@ msgstr "Envoyer un Message de confirmation" #. module: account_followup #: wizard_field:account_followup.followup.print.all,init,followup_id:0 msgid "Follow-up" -msgstr "" +msgstr "Relance" #. module: account_followup #: field:account_followup.stat,name:0 @@ -483,11 +518,14 @@ msgstr "Jour de délais" #. module: account_followup #: code:addons/account_followup/wizard/wizard_followup_print.py:0 #, python-format -msgid "All emails have been successfully sent to Partners:.\n\n" +msgid "" +"All emails have been successfully sent to Partners:.\n" +"\n" msgstr "" +"Tous les courriels ont été envoyés avec succès aux Partenaires :.\n" +"\n" #. module: account_followup #: wizard_button:account_followup.followup.print.all,next,print:0 msgid "Print Follow Ups & Send Mails" -msgstr "" - +msgstr "Imprimer les Relances et envoyer les Courriels" diff --git a/addons/account_invoice_layout/i18n/fr_FR.po b/addons/account_invoice_layout/i18n/fr_FR.po index d92ce2d43d2..6583fd448ed 100644 --- a/addons/account_invoice_layout/i18n/fr_FR.po +++ b/addons/account_invoice_layout/i18n/fr_FR.po @@ -4,16 +4,16 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.1\n" +"Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-05-19 14:36+0000\n" -"PO-Revision-Date: 2009-06-12 13:09+0000\n" -"Last-Translator: Olivier (OpenERP) \n" +"PO-Revision-Date: 2009-07-07 13:36+0000\n" +"Last-Translator: Olivier (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-06-12 13:20+0000\n" +"X-Launchpad-Export-Date: 2009-07-07 13:44+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_invoice_layout @@ -165,7 +165,7 @@ msgstr "Message Spécial" #. module: account_invoice_layout #: view:notify.message:0 msgid "Write a notification or a wishful message." -msgstr "" +msgstr "Ecrire un avis" #. module: account_invoice_layout #: rml:account.invoice.layout:0 diff --git a/addons/account_payment/i18n/fr_FR.po b/addons/account_payment/i18n/fr_FR.po index dc618ce115c..9101b27f30a 100644 --- a/addons/account_payment/i18n/fr_FR.po +++ b/addons/account_payment/i18n/fr_FR.po @@ -6,14 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-19 14:22:20+0000\n" -"PO-Revision-Date: 2009-05-20 10:22:20+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-05-20 12:36+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-07-07 11:17+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: account_payment #: field:payment.order,date_planned:0 @@ -49,14 +50,18 @@ msgstr "Compte du Partenaire principal" #. module: account_payment #: help:account.invoice,amount_to_pay:0 -msgid "The amount which should be paid at the current date\n" +msgid "" +"The amount which should be paid at the current date\n" "minus the amount which is already in payment order" -msgstr "Le montant qui doit être payé à la date courante\n" +msgstr "" +"Le montant qui doit être payé à la date courante\n" "moins le montant qui se trouve déjà dans l'ordre de paiement" #. module: account_payment #: help:payment.line,date:0 -msgid "If no payment date is specified, the bank will treat this payment line directly" +msgid "" +"If no payment date is specified, the bank will treat this payment line " +"directly" msgstr "" #. module: account_payment @@ -206,7 +211,10 @@ msgstr "" #. module: account_payment #: help:payment.order,date_prefered:0 -msgid "Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution." +msgid "" +"Choose an option for the Payment Order:'Fixed' stands for a date specified " +"by you.'Directly' stands for the direct execution.'Due date' stands for the " +"scheduled date of execution." msgstr "" #. module: account_payment @@ -374,7 +382,9 @@ msgstr "Réference :" #. module: account_payment #: help:payment.line,move_line_id:0 -msgid "This Entry Line will be referred for the information of the ordering customer." +msgid "" +"This Entry Line will be referred for the information of the ordering " +"customer." msgstr "" #. module: account_payment @@ -461,8 +471,11 @@ msgstr "Information" #. module: account_payment #: constraint:ir.model:0 -msgid "The Object name must start with x_ and not contain any special character !" -msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !" +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères " +"spéciaux !" #. module: account_payment #: model:ir.actions.wizard,name:account_payment.wizard_pay_payment @@ -542,7 +555,9 @@ msgstr "Ligne d'entrée" #. module: account_payment #: help:payment.line,communication:0 -msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order ?'" +msgid "" +"Used as the message between ordering customer and current company. Depicts " +"'What do you want to say to the recipient about this order ?'" msgstr "" #. module: account_payment @@ -620,4 +635,3 @@ msgstr "" #: field:payment.mode,journal:0 msgid "Journal" msgstr "Journal" - diff --git a/addons/account_report/i18n/fr_FR.po b/addons/account_report/i18n/fr_FR.po index a0fba03f1eb..db6dde5f8fa 100644 --- a/addons/account_report/i18n/fr_FR.po +++ b/addons/account_report/i18n/fr_FR.po @@ -1,27 +1,366 @@ # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * account_reporting +# * account_report # msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-04-09 17:23+0000\n" -"PO-Revision-Date: 2009-07-06 13:35+0000\n" -"Last-Translator: Olivier (OpenERP) \n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-05-20 13:34+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-07-06 14:04+0000\n" +"X-Launchpad-Export-Date: 2009-07-07 11:06+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#. module: account_reporting -#: field:color.rml,code:0 -msgid "code" -msgstr "code" +#. module: account_report +#: field:account.report.history,name:0 +#: selection:account.report.report,type:0 +#: model:ir.model,name:account_report.model_account_report_history +msgid "Indicator" +msgstr "Indicateur" -#. module: account_reporting +#. module: account_report +#: wizard_field:print.indicators.pdf,init,file:0 +msgid "Select a PDF File" +msgstr "Sélectionnez un fichier PDF" + +#. module: account_report +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "" + +#. module: account_report +#: view:account.report.report:0 +msgid "Operators:" +msgstr "Opérateurs" + +#. module: account_report +#: field:account.report.report,parent_id:0 +msgid "Parent" +msgstr "Parent" + +#. module: account_report +#: field:account.report.report,disp_graph:0 +msgid "Display As Graph" +msgstr "" + +#. module: account_report +#: view:account.report.report:0 +msgid "Account Debit:" +msgstr "" + +#. module: account_report +#: selection:account.report.report,type:0 +msgid "Others" +msgstr "Autres" + +#. module: account_report +#: view:account.report.report:0 +msgid "balance(['ACCOUNT_CODE',],fiscalyear)" +msgstr "" + +#. module: account_report +#: rml:print.indicators:0 +msgid "Tabular Summary" +msgstr "Résumé tabulaire" + +#. module: account_report +#: code:addons/account_report/wizard/wizard_print_indicators.py:0 +#, python-format +msgid "Please select maximum 8 records to fit the page-width." +msgstr "" + +#. module: account_report +#: view:account.report.report:0 +msgid "Notes" +msgstr "Notes" + +#. module: account_report +#: view:account.report.report:0 +msgid "= Goodness Indicator Limit:" +msgstr "" + +#. module: account_report +#: view:account.report.report:0 +msgid "Very bad" +msgstr "Très mauvais" + +#. module: account_report +#: field:account.report.history,val:0 +#: field:account.report.report,amount:0 +msgid "Value" +msgstr "Valeur" + +#. module: account_report +#: view:account.report.report:0 +msgid "= Badness Indicator Limit:" +msgstr "" + +#. module: account_report +#: view:account.report.report:0 +#: selection:account.report.report,status:0 +msgid "Bad" +msgstr "Mauvais" + +#. module: account_report +#: wizard_view:print.indicators.pdf,init:0 +msgid "Select the PDF file on which Indicators will be printed." +msgstr "" +"Sélectionnez le fichier PDF sur lequel les indicateurs seront imprimés." + +#. module: account_report +#: view:account.report.report:0 +msgid "> Goodness Indicator Limit:" +msgstr "" + +#. module: account_report +#: field:account.report.report,badness_limit:0 +msgid "Badness Indicator Limit" +msgstr "" + +#. module: account_report +#: selection:account.report.report,status:0 +msgid "Very Bad" +msgstr "Très mauvais" + +#. module: account_report +#: model:ir.actions.act_window,name:account_report.account_report_history_record_structure +msgid "Indicator history" +msgstr "Historique de l'Indicateur" + +#. module: account_report +#: view:account.report.report:0 +msgid "credit(['ACCOUNT_CODE',],fiscalyear)" +msgstr "" + +#. module: account_report +#: view:account.report.report:0 +msgid "Report Amount:" +msgstr "" + +#. module: account_report +#: model:ir.actions.report.xml,name:account_report.fiscal_statements +msgid "Fiscal Statements" +msgstr "Extraits fiscaux" + +#. module: account_report +#: wizard_button:print.indicators,init,next:0 +msgid "Next" +msgstr "Suivant" + +#. module: account_report +#: model:ir.module.module,shortdesc:account_report.module_meta_information +msgid "Reporting for accounting" +msgstr "" + +#. module: account_report +#: wizard_button:print.indicators,next,print:0 +#: wizard_button:print.indicators.pdf,init,print:0 +msgid "Print" +msgstr "Imprimer" + +#. module: account_report +#: field:account.report.report,type:0 +msgid "Type" +msgstr "Type" + +#. module: account_report +#: model:ir.actions.report.xml,name:account_report.report_indicator_pdf +msgid "Print Indicators in PDF" +msgstr "Imprimer les Indicateurs dans le fichier PDF" + +#. module: account_report +#: view:account.report.report:0 +msgid "Account Tax Code:" +msgstr "" + +#. module: account_report +#: view:account.report.report:0 +#: selection:account.report.report,status:0 +msgid "Good" +msgstr "Bon" + +#. module: account_report +#: code:addons/account_report/account.py:0 +#, python-format +msgid "Error !" +msgstr "Erreur !" + +#. module: account_report +#: view:account.report.history:0 +msgid "Account Report History" +msgstr "" + +#. module: account_report +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "XML non valide pour l'architecture de la vue" + +#. module: account_report +#: help:account.report.report,badness_limit:0 +msgid "This Value sets the limit of badness." +msgstr "" + +#. module: account_report +#: wizard_field:print.indicators,init,select_base:0 +msgid "Choose Criteria" +msgstr "Choisissez les critères" + +#. module: account_report +#: view:account.report.report:0 +msgid "debit(['ACCOUNT_CODE',],fiscalyear)" +msgstr "" + +#. module: account_report +#: view:account.report.report:0 +msgid "Account Credit:" +msgstr "" + +#. module: account_report +#: wizard_view:print.indicators,init:0 +msgid "Select the criteria based on which Indicators will be printed." +msgstr "" +"Sélectionnez les critères sur lesquels seront basés les indicateurs à " +"imprimer." + +#. module: account_report +#: view:account.report.report:0 +msgid "< Badness Indicator Limit:" +msgstr "" + +#. module: account_report +#: view:account.report.report:0 +#: selection:account.report.report,status:0 +msgid "Very Good" +msgstr "Très bien" + +#. module: account_report +#: field:account.report.report,note:0 +msgid "Note" +msgstr "Note" + +#. module: account_report +#: rml:accounting.report:0 +#: rml:print.indicators:0 +msgid "Currency:" +msgstr "Devise" + +#. module: account_report +#: field:account.report.report,status:0 +msgid "Status" +msgstr "Status" + +#. module: account_report +#: help:account.report.report,disp_tree:0 +msgid "" +"When the indicators are printed, if one indicator is set with this field to " +"True, then it will display one more graphs with all its children in tree" +msgstr "" + +#. module: account_report +#: selection:account.report.report,status:0 +msgid "Normal" +msgstr "Normal" + +#. module: account_report +#: view:account.report.report:0 +msgid "Example: (balance(['6','45'],-1) - credit(['7'])) / report('RPT1')" +msgstr "" + +#. module: account_report +#: field:account.report.report,active:0 +msgid "Active" +msgstr "Actif" + +#. module: account_report +#: field:account.report.report,disp_tree:0 +msgid "Display Tree" +msgstr "" + +#. module: account_report +#: selection:print.indicators,init,select_base:0 +msgid "Based On Fiscal Years" +msgstr "Basé sur les Années Fiscales" + +#. module: account_report +#: model:ir.model,name:account_report.model_account_report_report +msgid "Account reporting" +msgstr "Rapport de compte" + +#. module: account_report +#: view:account.report.report:0 +msgid "Account Balance:" +msgstr "" + +#. module: account_report +#: rml:print.indicators:0 +msgid "Expression :" +msgstr "Expression :" + +#. module: account_report +#: view:account.report.report:0 +msgid "report('REPORT_CODE')" +msgstr "Rapport comptable" + +#. module: account_report +#: field:account.report.report,expression:0 +msgid "Expression" +msgstr "Expression" + +#. module: account_report +#: view:account.report.report:0 +msgid "Accounting reporting" +msgstr "Rapport comptable" + +#. module: account_report +#: model:ir.actions.act_window,name:account_report.action_account_report_form +#: model:ir.ui.menu,name:account_report.menu_action_account_report_form +msgid "New Reporting Item Formula" +msgstr "Nouvelle formule" + +#. module: account_report +#: field:account.report.report,code:0 +#: rml:accounting.report:0 +msgid "Code" +msgstr "Code" + +#. module: account_report +#: field:account.report.history,tmp:0 +msgid "temp" +msgstr "" + +#. module: account_report +#: field:account.report.history,period_id:0 +msgid "Period" +msgstr "Période" + +#. module: account_report +#: view:account.report.report:0 +msgid "General" +msgstr "Général" + +#. module: account_report +#: view:account.report.report:0 +msgid "Legend of operators" +msgstr "Légende des opérateurs" + +#. module: account_report +#: wizard_button:print.indicators,init,end:0 +#: wizard_button:print.indicators,next,end:0 +#: wizard_button:print.indicators.pdf,init,end:0 +msgid "Cancel" +msgstr "Annuler" + +#. module: account_report +#: field:account.report.report,child_ids:0 +msgid "Children" +msgstr "" + +#. module: account_report #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" @@ -29,214 +368,195 @@ msgstr "" "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères " "spéciaux !" -#. module: account_reporting -#: selection:account.report.bs,font_style:0 -msgid "Helvetica-Bold" -msgstr "Helvetica-Bold" - -#. module: account_reporting -#: selection:account.report.bs,font_style:0 -msgid "Helvetica" -msgstr "Helvetica" - -#. module: account_reporting -#: field:account.report.bs,note:0 -msgid "Note" -msgstr "Note" - -#. module: account_reporting -#: field:account.report.bs,report_type:0 -msgid "Report Type" -msgstr "Type de Rapport" - -#. module: account_reporting -#: model:ir.ui.menu,name:account_reporting.action_account_report_bs_form -#: model:ir.ui.menu,name:account_reporting.menu_finan_config_BSheet -msgid "Balance Sheet Report" -msgstr "Rapport de bilan" - -#. module: account_reporting -#: selection:account.report.bs,font_style:0 -msgid "Courier" -msgstr "Courier" - -#. module: account_reporting -#: selection:account.report.bs,font_style:0 -msgid "Courier-BoldOblique" -msgstr "Courier-BoldOblique" - -#. module: account_reporting -#: wizard_button:account.account.balancesheet.report,init,report:0 -msgid "Print BalanceSheet" -msgstr "Impression du bilan" - -#. module: account_reporting -#: help:account.account.balancesheet.report,init,periods:0 -msgid "All periods if empty" -msgstr "Toutes les périodes si vide" - -#. module: account_reporting -#: field:account.report.bs,color_font:0 -msgid "Font Color" -msgstr "Couleur de la police" - -#. module: account_reporting -#: selection:account.report.bs,report_type:0 -msgid "Report Objects With Accounts and child of Accounts" -msgstr "Rapport des objets avec les comptes et les comptes fils" - -#. module: account_reporting -#: model:ir.module.module,description:account_reporting.module_meta_information -msgid "" -"Financial and accounting reporting\n" -" Balance Sheet Report" +#. module: account_report +#: help:account.report.report,goodness_limit:0 +msgid "This Value sets the limit of goodness." msgstr "" -"Rapports financiers et comptables \n" -" Rapport de bilan" -#. module: account_reporting -#: selection:account.report.bs,font_style:0 -msgid "Courier-Oblique" -msgstr "Courier-Oblique" +#. module: account_report +#: model:ir.actions.wizard,name:account_report.wizard_print_indicators +#: model:ir.ui.menu,name:account_report.menu_wizard_print_indicators +#: wizard_view:print.indicators,init:0 +#: wizard_view:print.indicators,next:0 +msgid "Print Indicators" +msgstr "Imprimer les Indicateurs" -#. module: account_reporting -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "XML non valide pour l'architecture de la vue" +#. module: account_report +#: view:account.report.report:0 +msgid "+ - * / ( )" +msgstr "+ - * / ( )" -#. module: account_reporting -#: field:account.report.bs,name:0 -#: field:color.rml,name:0 +#. module: account_report +#: rml:accounting.report:0 +#: rml:print.indicators:0 +msgid "Printing date:" +msgstr "Date d'impression" + +#. module: account_report +#: model:ir.actions.wizard,name:account_report.wizard_indicators_with_pdf +msgid "Indicators in PDF" +msgstr "Indicateurs en PDF" + +#. module: account_report +#: rml:accounting.report:0 +#: rml:print.indicators:0 +msgid "at" +msgstr "à" + +#. module: account_report +#: rml:accounting.report:0 +msgid "Accounting Report" +msgstr "Rapport comptable" + +#. module: account_report +#: field:account.report.report,goodness_limit:0 +msgid "Goodness Indicator Limit" +msgstr "" + +#. module: account_report +#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_other +#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_other +msgid "Other reports" +msgstr "" + +#. module: account_report +#: view:account.report.report:0 +msgid "" +"Note: The second arguement 'fiscalyear' and 'period' are optional " +"arguements.If the value is -1,previous fiscalyear or period is considered." +msgstr "" + +#. module: account_report +#: rml:print.indicators:0 +msgid ")" +msgstr ")" + +#. module: account_report +#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_fiscal +#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_fiscal +msgid "Fiscal Statements reporting" +msgstr "Rapport des extraits fiscaux" + +#. module: account_report +#: selection:print.indicators,init,select_base:0 +msgid "Based on Fiscal Periods" +msgstr "Basé sur les Périodes Fiscales" + +#. module: account_report +#: model:ir.actions.report.xml,name:account_report.report_print_indicators +#: rml:print.indicators:0 +msgid "Indicators" +msgstr "Indicateurs" + +#. module: account_report +#: wizard_view:print.indicators.pdf,init:0 +msgid "Print Indicators with PDF" +msgstr "Imprimer les Indicateurs dans le fichier PDF" + +#. module: account_report +#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_indicator +#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_indicator +msgid "Indicators reporting" +msgstr "Rapport d'indicateurs" + +#. module: account_report +#: field:account.report.report,name:0 +#: rml:accounting.report:0 +#: rml:print.indicators:0 msgid "Name" msgstr "Nom" -#. module: account_reporting -#: view:account.report.bs:0 -msgid "Account reporting" -msgstr "Rapport de compte" +#. module: account_report +#: wizard_field:print.indicators,next,base_selection:0 +msgid "Select Criteria" +msgstr "Sélectionnez les critères" -#. module: account_reporting -#: model:ir.ui.menu,name:account_reporting.bs_report_action_form -msgid "Balance Sheet Report Form" -msgstr "Formulaire du rapport de bilan" +#. module: account_report +#: code:addons/account_report/account.py:0 +#, python-format +msgid "" +"You cannot delete an indicator history record. You may have to delete the " +"concerned Indicator!" +msgstr "" +"Vous ne pouvez pas supprimer un enregistrement de l'historique d'un " +"indicateur. Vous devez supprimer l'Indicateur concerné." -#. module: account_reporting -#: view:account.report.bs:0 -msgid "Notes" -msgstr "Notes" +#. module: account_report +#: view:account.report.report:0 +msgid "tax_code(['ACCOUNT_TAX_CODE',],period)" +msgstr "" -#. module: account_reporting -#: selection:account.report.bs,font_style:0 -msgid "Times-BoldItalic" -msgstr "Times-BoldItalic" +#. module: account_report +#: field:account.report.history,fiscalyear_id:0 +msgid "Fiscal Year" +msgstr "Année Fiscale" -#. module: account_reporting -#: model:ir.model,name:account_reporting.model_account_report_bs -msgid "Account reporting for Balance Sheet" -msgstr "Rapports des comptes pour le bilan" +#. module: account_report +#: model:ir.actions.act_window,name:account_report.action_account_report_tree +#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view +#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_define +#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view +msgid "Custom reporting" +msgstr "Personnaliser un rapport" -#. module: account_reporting -#: selection:account.report.bs,font_style:0 -msgid "Courier-Bold" -msgstr "Courier-Bold" +#. module: account_report +#: code:addons/account_report/wizard/wizard_print_indicators.py:0 +#, python-format +msgid "User Error!" +msgstr "" -#. module: account_reporting -#: selection:account.report.bs,font_style:0 -msgid "Times-Italic" -msgstr "Times-Italic" +#. module: account_report +#: rml:print.indicators:0 +msgid "Page" +msgstr "Page" -#. module: account_reporting -#: selection:account.report.bs,report_type:0 -msgid "Report Objects Only" -msgstr "Rapport sur les objets seulement" +#. module: account_report +#: selection:account.report.report,type:0 +msgid "View" +msgstr "Vue" -#. module: account_reporting -#: model:ir.model,name:account_reporting.model_color_rml -msgid "Rml Colors" -msgstr "Couleurs RML" +#. module: account_report +#: rml:print.indicators:0 +msgid "Indicators -" +msgstr "Indicateurs -" -#. module: account_reporting -#: model:ir.module.module,shortdesc:account_reporting.module_meta_information -msgid "Reporting of Balancesheet for accounting" -msgstr "Rapport sur bilan pour la comptabilité" +#. module: account_report +#: help:account.report.report,disp_graph:0 +msgid "" +"If the field is set to True, information will be printed as a Graph, " +"otherwise as an array." +msgstr "" -#. module: account_reporting -#: field:account.report.bs,code:0 -msgid "Code" -msgstr "Code" +#. module: account_report +#: view:account.report.report:0 +msgid "Return value for status" +msgstr "Valeur de retour pour status" -#. module: account_reporting -#: field:account.report.bs,parent_id:0 -msgid "Parent" -msgstr "Parent" - -#. module: account_reporting -#: field:account.report.bs,sequence:0 +#. module: account_report +#: field:account.report.report,sequence:0 msgid "Sequence" msgstr "Séquence" -#. module: account_reporting -#: selection:account.report.bs,font_style:0 -msgid "Times-Bold" -msgstr "Times-Bold" +#. module: account_report +#: rml:accounting.report:0 +msgid "Amount" +msgstr "Montant" -#. module: account_reporting -#: view:account.report.bs:0 -msgid "General" -msgstr "Général" +#. module: account_report +#: rml:print.indicators:0 +msgid "1cm 27.7cm 20cm 27.7cm" +msgstr "1cm 27.7cm 20cm 27.7cm" -#. module: account_reporting -#: wizard_field:account.account.balancesheet.report,init,fiscalyear:0 -msgid "Fiscal year" -msgstr "Année fiscale" +#. module: account_report +#: model:ir.module.module,description:account_report.module_meta_information +msgid "" +"Financial and accounting reporting\n" +" Fiscal statements\n" +" Indicators\n" +" " +msgstr "" -#. module: account_reporting -#: view:account.report.bs:0 -#: field:account.report.bs,account_id:0 -msgid "Accounts" -msgstr "Comptes" - -#. module: account_reporting -#: wizard_field:account.account.balancesheet.report,init,periods:0 -msgid "Periods" -msgstr "Périodes" - -#. module: account_reporting -#: field:account.report.bs,color_back:0 -msgid "Back Color" -msgstr "Couleur de fond" - -#. module: account_reporting -#: field:account.report.bs,child_id:0 -msgid "Children" -msgstr "Fils" - -#. module: account_reporting -#: wizard_button:account.account.balancesheet.report,init,end:0 -msgid "Cancel" -msgstr "Annuler" - -#. module: account_reporting -#: selection:account.report.bs,font_style:0 -msgid "Times-Roman" -msgstr "Times-Roman" - -#. module: account_reporting -#: selection:account.report.bs,font_style:0 -msgid "Helvetica-Oblique" -msgstr "Helvetica-Oblique" - -#. module: account_reporting -#: field:account.report.bs,font_style:0 -msgid "Font" -msgstr "Police" - -#. module: account_reporting -#: wizard_view:account.account.balancesheet.report,init:0 -msgid "Customize Report" -msgstr "Personnaliser le Rapport" - -#. module: account_reporting -#: selection:account.report.bs,report_type:0 -msgid "Report Objects With Accounts" -msgstr "Rapport des objets avec les comptes" +#. module: account_report +#: selection:account.report.report,type:0 +msgid "Fiscal Statement" +msgstr "" diff --git a/addons/account_reporting/i18n/fr_FR.po b/addons/account_reporting/i18n/fr_FR.po index c80cab02c02..5ed3e293258 100644 --- a/addons/account_reporting/i18n/fr_FR.po +++ b/addons/account_reporting/i18n/fr_FR.po @@ -6,14 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-19 14:22:20+0000\n" -"PO-Revision-Date: 2009-05-20 10:22:20+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-05-20 12:12+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-07-07 11:23+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: account_reporting #: field:color.rml,code:0 @@ -22,8 +23,11 @@ msgstr "code" #. module: account_reporting #: constraint:ir.model:0 -msgid "The Object name must start with x_ and not contain any special character !" -msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !" +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères " +"spéciaux !" #. module: account_reporting #: selection:account.report.bs,font_style:0 @@ -88,7 +92,8 @@ msgstr "" #. module: account_reporting #: model:ir.module.module,description:account_reporting.module_meta_information -msgid "Financial and accounting reporting\n" +msgid "" +"Financial and accounting reporting\n" " Balance Sheet Report" msgstr "" @@ -238,4 +243,3 @@ msgstr "Police" #: wizard_view:account.account.balancesheet.report,init:0 msgid "Customize Report" msgstr "Personnaliser le Rapport" - diff --git a/addons/account_tax_include/i18n/fr_FR.po b/addons/account_tax_include/i18n/fr_FR.po index eee7d6d0aa7..640de885a7b 100644 --- a/addons/account_tax_include/i18n/fr_FR.po +++ b/addons/account_tax_include/i18n/fr_FR.po @@ -8,12 +8,12 @@ msgstr "" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-05-19 14:36+0000\n" "PO-Revision-Date: 2009-06-12 13:37+0000\n" -"Last-Translator: Olivier (OpenERP) \n" +"Last-Translator: Olivier (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-06-12 13:56+0000\n" +"X-Launchpad-Export-Date: 2009-07-07 11:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_tax_include diff --git a/addons/account_voucher/account.py b/addons/account_voucher/account.py index 58b7c7dff21..4006cde9863 100644 --- a/addons/account_voucher/account.py +++ b/addons/account_voucher/account.py @@ -159,44 +159,45 @@ class Account(osv.osv): else: vals['type1'] = 'none' super(Account, self).write(cr, uid,ids, vals, context) - self_obj= self.browse(cr,uid,ids) - move_pool=self.pool.get('account.move') - if vals: - for obj in self_obj: - flg=0 - if obj.journal_id and obj.journal_id.type == 'situation': - move=move_pool.search(cr,uid,[('journal_id','=',obj.journal_id.id)]) - if move: - move_obj=move_pool.browse(cr,uid,move[0]) - move=move[0] - else: - name = self.pool.get('ir.sequence').get_id(cr, uid, obj.journal_id.sequence_id.id) - move_data = {'name': name, 'journal_id': obj.journal_id.id} - move=self.pool.get('account.move').create(cr,uid,move_data) - move_obj=move_pool.browse(cr,uid,move) - move_line_data={'name':obj.journal_id.name, - 'debit':obj.debit or 0.0, - 'credit':obj.credit or 0.0, - 'account_id':obj.id, - 'move_id':move, - 'journal_id':obj.journal_id.id, - 'period_id':move_obj.period_id.id, - } - if obj.type1: - if obj.type1 == 'dr': - move_line_data['debit'] = obj.open_bal - elif obj.type1 == 'cr': - move_line_data['credit'] = obj.open_bal - if move_obj and move: - for move_line in move_obj.line_id: - if move_line.account_id.id == obj.id: - if move_line_data['debit'] == 0.0 and move_line_data['credit']== 0.0: - self.pool.get('account.move.line').unlink(cr,uid,[move_line.id]) - else: - self.pool.get('account.move.line').write(cr,uid,[move_line.id],move_line_data) - flg=1 - if not flg: - self.pool.get('account.move.line').create(cr,uid,move_line_data) + if vals.has_key('open_bal'): + self_obj= self.browse(cr,uid,ids) + move_pool=self.pool.get('account.move') + if vals: + for obj in self_obj: + flg=0 + if obj.journal_id and obj.journal_id.type == 'situation': + move=move_pool.search(cr,uid,[('journal_id','=',obj.journal_id.id)]) + if move: + move_obj=move_pool.browse(cr,uid,move[0]) + move=move[0] + else: + name = self.pool.get('ir.sequence').get_id(cr, uid, obj.journal_id.sequence_id.id) + move_data = {'name': name, 'journal_id': obj.journal_id.id} + move=self.pool.get('account.move').create(cr,uid,move_data) + move_obj=move_pool.browse(cr,uid,move) + move_line_data={'name':obj.journal_id.name, + 'debit':obj.debit or 0.0, + 'credit':obj.credit or 0.0, + 'account_id':obj.id, + 'move_id':move, + 'journal_id':obj.journal_id.id, + 'period_id':move_obj.period_id.id, + } + if obj.type1: + if obj.type1 == 'dr': + move_line_data['debit'] = obj.open_bal + elif obj.type1 == 'cr': + move_line_data['credit'] = obj.open_bal + if move_obj and move: + for move_line in move_obj.line_id: + if move_line.account_id.id == obj.id: + if move_line_data['debit'] == 0.0 and move_line_data['credit']== 0.0: + self.pool.get('account.move.line').unlink(cr,uid,[move_line.id]) + else: + self.pool.get('account.move.line').write(cr,uid,[move_line.id],move_line_data) + flg=1 + if not flg: + self.pool.get('account.move.line').create(cr,uid,move_line_data) return True def onchange_type(self, cr, uid, ids,user_type,type1): diff --git a/addons/account_voucher/account_view.xml b/addons/account_voucher/account_view.xml index 721fc0c2604..5201e41e468 100755 --- a/addons/account_voucher/account_view.xml +++ b/addons/account_voucher/account_view.xml @@ -70,13 +70,12 @@ - account.form + account.form1 account.account form - @@ -86,7 +85,7 @@ - account.form + account.form2 account.account form @@ -97,11 +96,11 @@ - - account.form + + account.tree1 account.account - form + tree @@ -109,15 +108,14 @@ - - account.form + + account.tree2 account.account - form + tree - - - + + diff --git a/addons/account_voucher/i18n/fr_FR.po b/addons/account_voucher/i18n/fr_FR.po index 6212d6b266a..0ffb0449972 100644 --- a/addons/account_voucher/i18n/fr_FR.po +++ b/addons/account_voucher/i18n/fr_FR.po @@ -6,14 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-19 14:22:20+0000\n" -"PO-Revision-Date: 2009-05-20 10:22:20+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-05-20 12:27+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-07-07 11:18+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: account_voucher #: model:ir.actions.act_window,name:account_voucher.act_account_acount_move_line_open1 @@ -441,8 +442,11 @@ msgstr "Pro-forma" #. module: account_voucher #: constraint:ir.model:0 -msgid "The Object name must start with x_ and not contain any special character !" -msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !" +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères " +"spéciaux !" #. module: account_voucher #: view:account.voucher:0 @@ -594,4 +598,3 @@ msgstr "Souche de Reçu Bancaire" #: field:account.voucher,journal_id:0 msgid "Journal" msgstr "Journal" - diff --git a/addons/analytic_journal_billing_rate/i18n/fr_FR.po b/addons/analytic_journal_billing_rate/i18n/fr_FR.po index 191f5c87e59..8dcb202c240 100644 --- a/addons/analytic_journal_billing_rate/i18n/fr_FR.po +++ b/addons/analytic_journal_billing_rate/i18n/fr_FR.po @@ -8,12 +8,12 @@ msgstr "" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-05-19 14:36+0000\n" "PO-Revision-Date: 2009-06-12 13:38+0000\n" -"Last-Translator: Olivier (OpenERP) \n" +"Last-Translator: Olivier (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-06-12 14:00+0000\n" +"X-Launchpad-Export-Date: 2009-07-07 11:22+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_journal_billing_rate diff --git a/addons/analytic_user_function/i18n/fr_FR.po b/addons/analytic_user_function/i18n/fr_FR.po index f180bd1eeb2..3d88a00326d 100644 --- a/addons/analytic_user_function/i18n/fr_FR.po +++ b/addons/analytic_user_function/i18n/fr_FR.po @@ -6,14 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-19 14:22:20+0000\n" -"PO-Revision-Date: 2009-05-20 10:22:20+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-05-20 13:01+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-07-07 11:16+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: analytic_user_function #: constraint:ir.ui.view:0 @@ -28,8 +29,11 @@ msgstr "" #. module: analytic_user_function #: constraint:ir.model:0 -msgid "The Object name must start with x_ and not contain any special character !" -msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !" +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères " +"spéciaux !" #. module: analytic_user_function #: field:analytic_user_funct_grid,product_id:0 @@ -55,7 +59,9 @@ msgstr "Utilisateur" #. module: analytic_user_function #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid msgid "Relation table between users and products on a analytic account" -msgstr "Tableau de relation entre les utilisateurs et les produits sur un compte analytique" +msgstr "" +"Tableau de relation entre les utilisateurs et les produits sur un compte " +"analytique" #. module: analytic_user_function #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information @@ -66,4 +72,3 @@ msgstr "" #: view:analytic_user_funct_grid:0 msgid "User's Product for this Analytic Account" msgstr "Produit de l'Utilisateur pour ce Compte Analytique" - diff --git a/addons/auction/auction.py b/addons/auction/auction.py index 176ac3039bb..4fe20c5f0bd 100644 --- a/addons/auction/auction.py +++ b/addons/auction/auction.py @@ -76,7 +76,7 @@ class auction_dates(osv.osv): 'acc_income': fields.many2one('account.account', 'Income Account', required=True), 'acc_expense': fields.many2one('account.account', 'Expense Account', required=True), 'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication',store=True), - 'state': fields.selection((('draft','Draft'),('close','Closed')),'Status',select=1, readonly=True), + 'state': fields.selection((('draft','Draft'),('closed','Closed')),'Status',select=1, readonly=True), 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True), } @@ -999,7 +999,7 @@ class report_seller_auction(osv.osv): select adl.id as auction, min(al.id) as id, - adl.auction1 as date, + to_char(adl.auction1, 'YYYY-MM-DD') as date, ad.partner_id as seller, count(al.id) as "object_number", SUM(al.obj_price) as "total_price", @@ -1037,7 +1037,7 @@ class report_seller_auction2(osv.osv): cr.execute('''create or replace view report_seller_auction2 as (select min(al.id) as id, - adl.auction1 as date, + to_char(adl.auction1, 'YYYY-MM-DD') as date, adl.id as auction, ad.partner_id as seller, sum(al.obj_price) as "sum_adj", @@ -1073,7 +1073,7 @@ class report_auction_view2(osv.osv): cr.execute('''create or replace view report_auction_view2 as ( select ad.id as id, - ad.auction1 as date, + to_char(ad.auction1, 'YYYY-MM-DD') as date, ad.id as "auction", count(al.id) as "obj_number", SUM(al.obj_price) as "sum_adj", diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index aaa4c8b1e6c..bbaa12a3601 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -1215,8 +1215,7 @@ sign in sign out report by user report.attendance form tree,graph - [('name','ilike',time.strftime('%Y-%m-%d'))] - [('employee_id','=',uid)] + [('name','=',time.strftime('%Y-%m-%d')),('employee_id','=',uid)] @@ -1226,7 +1225,7 @@ sign in sign out report by user report.attendance form tree,graph - [('name','ilike',time.strftime('%Y-%m-%d'))] + [('name','=',time.strftime('%Y-%m-%d'))] diff --git a/addons/auction/i18n/fr_FR.po b/addons/auction/i18n/fr_FR.po index a4b4e5a421a..4516d349ca9 100644 --- a/addons/auction/i18n/fr_FR.po +++ b/addons/auction/i18n/fr_FR.po @@ -6,14 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-19 14:22:20+0000\n" -"PO-Revision-Date: 2009-05-20 10:22:20+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-05-20 11:59+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-07-07 11:21+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: auction #: field:report.deposit.border,total_marge:0 @@ -286,7 +287,9 @@ msgstr "Dates" #. module: auction #: constraint:product.template:0 msgid "Error: UOS must be in a different category than the UOM" -msgstr "Erreur: l'unité de vente doit appartenir à une catégorie différente que l'unité de mesure" +msgstr "" +"Erreur: l'unité de vente doit appartenir à une catégorie différente que " +"l'unité de mesure" #. module: auction #: rml:auction.total.rml:0 @@ -463,7 +466,8 @@ msgstr "Vendu" #. module: auction #: constraint:hr.employee:0 msgid "Error ! You cannot create recursive Hierarchy of Employees." -msgstr "Erreur ! Vous ne pouvez pas créer de hiérarchie d'employés récursives." +msgstr "" +"Erreur ! Vous ne pouvez pas créer de hiérarchie d'employés récursives." #. module: auction #: field:auction.bid_line,name:0 @@ -666,7 +670,8 @@ msgstr "Erreur: code EAN invalide" #. module: auction #: model:ir.module.module,description:auction.module_meta_information -msgid "This module provides functionality to \n" +msgid "" +"This module provides functionality to \n" " manage artists, articles, sellers, buyers and auction.\n" " Manage bids, track of sold, paid and unpaid objects.\n" " Delivery Management. \n" @@ -1605,8 +1610,11 @@ msgstr "Créer les factures" #. module: auction #: constraint:product.template:0 -msgid "Error: The default UOM and the purchase UOM must be in the same category." -msgstr "Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent faire partie de la même catégorie" +msgid "" +"Error: The default UOM and the purchase UOM must be in the same category." +msgstr "" +"Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent " +"faire partie de la même catégorie" #. module: auction #: xsl:report.auction.vnd_bordereau:0 @@ -1745,8 +1753,11 @@ msgstr "" #. module: auction #: constraint:ir.model:0 -msgid "The Object name must start with x_ and not contain any special character !" -msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !" +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères " +"spéciaux !" #. module: auction #: field:auction.deposit,transfer:0 @@ -2026,7 +2037,8 @@ msgstr "Premier jour de l'exposition" #. module: auction #: wizard_view:auction.lots.auction_move,init:0 -msgid "Warning, this will erase the object adjudication price and its buyer !" +msgid "" +"Warning, this will erase the object adjudication price and its buyer !" msgstr "Attention, cela effacera l'adjudication de l'objet et son acheteur !" #. module: auction @@ -2607,4 +2619,3 @@ msgstr "Historique de la vente" #: xsl:report.auction.lots.list.landscape:0 msgid "Orders" msgstr "Commandes" - diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py index bd3eace7542..b721aad42a3 100644 --- a/addons/audittrail/audittrail.py +++ b/addons/audittrail/audittrail.py @@ -130,7 +130,12 @@ class audittrail_log_line(osv.osv): audittrail_log_line() -def get_value_text(cr, uid, field_name,values,object, context={}): + +objects_proxy = netsvc.SERVICES['object'].__class__ + +class audittrail_objects_proxy(objects_proxy): + + def get_value_text(self, cr, uid, field_name, values, object, context={}): pool = pooler.get_pool(cr.dbname) obj=pool.get(object.model) object_name=obj._name @@ -169,7 +174,7 @@ def get_value_text(cr, uid, field_name,values,object, context={}): return value return values -def create_log_line(cr,uid,id,object,lines=[]): + def create_log_line(self, cr, uid, id, object, lines=[]): pool = pooler.get_pool(cr.dbname) obj=pool.get(object.model) object_name=obj._name @@ -193,7 +198,7 @@ def create_log_line(cr,uid,id,object,lines=[]): cr.commit() return True -def log_fct( db, uid, passwd, object, method, fct_src , *args ): + def log_fct(self, db, uid, passwd, object, method, fct_src, *args): logged_uids = [] pool = pooler.get_pool(db) cr = pooler.get_db(db).cursor() @@ -215,10 +220,10 @@ def log_fct( db, uid, passwd, object, method, fct_src , *args ): line={ 'name':field, 'new_value':new_value[field], - 'new_value_text':get_value_text(cr,uid,field,new_value[field],model_object) + 'new_value_text': self.get_value_text(cr,uid,field,new_value[field],model_object) } lines.append(line) - create_log_line(cr,uid,id,model_object,lines) + self.create_log_line(cr,uid,id,model_object,lines) cr.commit() cr.close() return res_id @@ -229,7 +234,7 @@ def log_fct( db, uid, passwd, object, method, fct_src , *args ): old_values=pool.get(model_object.model).read(cr,uid,res_id,args[1].keys()) old_values_text={} for field in args[1].keys(): - old_values_text[field]=get_value_text(cr,uid,field,old_values[field],model_object) + old_values_text[field] = self.get_value_text(cr,uid,field,old_values[field],model_object) res =fct_src( db, uid, passwd, object, method, *args) cr.commit() if res: @@ -243,12 +248,12 @@ def log_fct( db, uid, passwd, object, method, fct_src , *args ): 'name':field, 'new_value':field in new_values and new_values[field] or '', 'old_value':field in old_values and old_values[field] or '', - 'new_value_text':get_value_text(cr,uid,field,new_values[field],model_object), + 'new_value_text': self.get_value_text(cr,uid,field,new_values[field],model_object), 'old_value_text':old_values_text[field] } lines.append(line) cr.commit() - create_log_line(cr,uid,id,model_object,lines) + self.create_log_line(cr,uid,id,model_object,lines) cr.close() return res @@ -271,11 +276,11 @@ def log_fct( db, uid, passwd, object, method, fct_src , *args ): line={ 'name':field, 'old_value':old_values[res_id][field], - 'old_value_text':get_value_text(cr,uid,field,old_values[res_id][field],model_object) + 'old_value_text': self.get_value_text(cr,uid,field,old_values[res_id][field],model_object) } lines.append(line) cr.commit() - create_log_line(cr,uid,id,model_object,lines) + self.create_log_line(cr,uid,id,model_object,lines) cr.close() return res @@ -294,28 +299,27 @@ def log_fct( db, uid, passwd, object, method, fct_src , *args ): line={ 'name':field, 'old_value':old_values[res_id][field], - 'old_value_text':get_value_text(cr,uid,field,old_values[res_id][field],model_object) + 'old_value_text': self.get_value_text(cr,uid,field,old_values[res_id][field],model_object) } lines.append(line) cr.commit() - create_log_line(cr,uid,id,model_object,lines) + self.create_log_line(cr,uid,id,model_object,lines) res =fct_src( db, uid, passwd, object, method, *args) cr.close() return res cr.close() -def tmp_fct(fct_src): - def execute( db, uid, passwd, object, method, *args): + def execute(self, db, uid, passwd, object, method, *args): pool = pooler.get_pool(db) cr = pooler.get_db(db).cursor() cr.autocommit(True) obj=pool.get(object) logged_uids = [] object_name=obj._name - obj_ids= pool.get('ir.model').search(cr, uid,[('model','=',object_name)]) - model_object=pool.get('ir.model').browse(cr,uid,obj_ids)[0] + + fct_src = super(audittrail_objects_proxy, self).execute - def my_fct( db, uid, passwd, object, method, *args): + def my_fct(db, uid, passwd, object, method, *args): field = method rule = False obj_ids= pool.get('ir.model').search(cr, uid,[('model','=',object_name)]) @@ -323,12 +327,12 @@ def tmp_fct(fct_src): if obj_name == 'audittrail.rule': rule = True if not rule: - return fct_src( db, uid, passwd, object, method, *args) + return fct_src(db, uid, passwd, object, method, *args) if not len(obj_ids): - return fct_src( db, uid, passwd, object, method, *args) + return fct_src(db, uid, passwd, object, method, *args) rule_ids=pool.get('audittrail.rule').search(cr, uid, [('object_id','=',obj_ids[0]),('state','=','subscribed')]) if not len(rule_ids): - return fct_src( db, uid, passwd, object, method, *args) + return fct_src(db, uid, passwd, object, method, *args) for thisrule in pool.get('audittrail.rule').browse(cr, uid, rule_ids): for user in thisrule.user_id: @@ -336,16 +340,13 @@ def tmp_fct(fct_src): if not len(logged_uids) or uid in logged_uids: if field in ('read','write','create','unlink'): if getattr(thisrule, 'log_'+field): - return log_fct(db, uid, passwd, object, method, fct_src , *args) - return fct_src( db, uid, passwd, object, method, *args) - res = my_fct( db, uid, passwd, object, method, *args) + return self.log_fct(db, uid, passwd, object, method, fct_src, *args) + return fct_src(db, uid, passwd, object, method, *args) + res = my_fct(db, uid, passwd, object, method, *args) cr.close() return res - return execute -obj = netsvc.SERVICES['object'] -obj.execute = tmp_fct(obj.execute) -obj.exportMethod(obj.execute) +audittrail_objects_proxy() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/audittrail/i18n/fr_FR.po b/addons/audittrail/i18n/fr_FR.po index 7cfa5b4c1da..5179ee4d59a 100644 --- a/addons/audittrail/i18n/fr_FR.po +++ b/addons/audittrail/i18n/fr_FR.po @@ -6,14 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-19 14:22:20+0000\n" -"PO-Revision-Date: 2009-05-20 10:22:20+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-05-20 12:41+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-07-07 11:10+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: audittrail #: model:ir.module.module,shortdesc:audittrail.module_meta_information @@ -22,8 +23,11 @@ msgstr "" #. module: audittrail #: constraint:ir.model:0 -msgid "The Object name must start with x_ and not contain any special character !" -msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !" +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères " +"spéciaux !" #. module: audittrail #: field:audittrail.log.line,log_id:0 @@ -148,8 +152,11 @@ msgstr "Nouvelle valeur texte: " #. module: audittrail #: model:ir.module.module,description:audittrail.module_meta_information -msgid "Allows the administrator to track every user operations on all objects of the system.\n" -" Subscribe Rules for read, write, create and delete on objects and check logs" +msgid "" +"Allows the administrator to track every user operations on all objects of " +"the system.\n" +" Subscribe Rules for read, write, create and delete on objects and check " +"logs" msgstr "" #. module: audittrail @@ -313,4 +320,3 @@ msgstr "Supprimer les journaux" #: field:audittrail.log,name:0 msgid "Name" msgstr "Nom" - diff --git a/addons/base_contact/i18n/fr_FR.po b/addons/base_contact/i18n/fr_FR.po index 725848d5f09..003fc58f28e 100644 --- a/addons/base_contact/i18n/fr_FR.po +++ b/addons/base_contact/i18n/fr_FR.po @@ -6,14 +6,40 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-19 14:22:20+0000\n" -"PO-Revision-Date: 2009-05-20 10:22:20+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-05-20 13:21+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-07-07 11:10+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: base_contact +#: field:res.partner.job,other:0 +msgid "Other" +msgstr "Autre" + +#. module: base_contact +#: help:res.partner.job,other:0 +msgid "Additional phone field" +msgstr "Champ téléphone additionnel" + +#. module: base_contact +#: field:res.partner.job,fax:0 +msgid "Fax" +msgstr "Fax" + +#. module: base_contact +#: field:res.partner.job,extension:0 +msgid "Extension" +msgstr "Poste" + +#. module: base_contact +#: help:res.partner.job,extension:0 +msgid "Internal/External extension phone number" +msgstr "Extension Interne/Externe numéro de téléphone" #. module: base_contact #: field:res.partner.job,sequence_contact:0 @@ -27,8 +53,11 @@ msgstr "res.partner.contact" #. module: base_contact #: constraint:ir.model:0 -msgid "The Object name must start with x_ and not contain any special character !" -msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !" +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères " +"spéciaux !" #. module: base_contact #: field:res.partner.job,function_id:0 @@ -65,11 +94,6 @@ msgstr "Prénom" msgid "Contact Partner Function" msgstr "Fonction du contact du partenaire" -#. module: base_contact -#: field:res.partner.job,other:0 -msgid "Other" -msgstr "" - #. module: base_contact #: model:process.transition,name:base_contact.process_transition_contacttofunction0 msgid "Contact to function" @@ -90,21 +114,11 @@ msgstr "Partenaire vers adresse" msgid "# of Contacts" msgstr "" -#. module: base_contact -#: help:res.partner.job,other:0 -msgid "Additional phone field" -msgstr "" - #. module: base_contact #: model:process.node,name:base_contact.process_node_function0 msgid "Function" msgstr "Fonction" -#. module: base_contact -#: field:res.partner.job,fax:0 -msgid "Fax" -msgstr "" - #. module: base_contact #: field:res.partner.contact,lang_id:0 msgid "Language" @@ -137,8 +151,12 @@ msgstr "" #. module: base_contact #: help:res.partner.job,sequence_partner:0 -msgid "Order of importance of this job title in the list of job title of the linked partner" -msgstr "Par ordre d'importance le titre de cet emploi dans la liste des titres d'emplois est lié au partenaire" +msgid "" +"Order of importance of this job title in the list of job title of the linked " +"partner" +msgstr "" +"Par ordre d'importance le titre de cet emploi dans la liste des titres " +"d'emplois est lié au partenaire" #. module: base_contact #: field:res.partner.contact,email:0 @@ -170,8 +188,12 @@ msgstr "Nationalité" #. module: base_contact #: help:res.partner.job,sequence_contact:0 -msgid "Order of importance of this address in the list of addresses of the linked contact" -msgstr "Par ordre d'importance, cette adresse dans la liste d'adresse est lié au contact" +msgid "" +"Order of importance of this address in the list of addresses of the linked " +"contact" +msgstr "" +"Par ordre d'importance, cette adresse dans la liste d'adresse est lié au " +"contact" #. module: base_contact #: field:res.partner.address,job_id:0 @@ -209,21 +231,11 @@ msgstr "Traiter les contacts de base" msgid "Seq." msgstr "Séq." -#. module: base_contact -#: field:res.partner.job,extension:0 -msgid "Extension" -msgstr "" - #. module: base_contact #: field:res.partner.contact,mobile:0 msgid "Mobile" msgstr "Portable" -#. module: base_contact -#: help:res.partner.job,extension:0 -msgid "Internal/External extension phone number" -msgstr "" - #. module: base_contact #: model:process.node,note:base_contact.process_node_contacts0 msgid "People you work with." @@ -346,4 +358,3 @@ msgstr "Site web" #: field:res.partner.contact,birthdate:0 msgid "Birth Date" msgstr "Date de naissance" - diff --git a/addons/base_iban/i18n/fr_FR.po b/addons/base_iban/i18n/fr_FR.po index 28cd3169ae4..bfd5bc1683f 100644 --- a/addons/base_iban/i18n/fr_FR.po +++ b/addons/base_iban/i18n/fr_FR.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-04-09 17:23+0000\n" -"PO-Revision-Date: 2009-07-06 13:05+0000\n" -"Last-Translator: Olivier (OpenERP) \n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-06-12 13:22+0000\n" +"Last-Translator: Olivier (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-07-06 13:28+0000\n" +"X-Launchpad-Export-Date: 2009-07-07 11:06+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_iban @@ -46,6 +46,12 @@ msgstr "BIC" msgid "iban" msgstr "IBAN" +#. module: base_iban +#: model:ir.module.module,shortdesc:base_iban.module_meta_information +#: field:res.partner.bank,iban:0 +msgid "IBAN" +msgstr "IBAN" + #. module: base_iban #: model:res.partner.bank.type,name:base_iban.bank_iban msgid "IBAN Account" @@ -55,9 +61,3 @@ msgstr "No IBAN du compte" #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field msgid "acc_number" msgstr "acc_number" - -#. module: base_iban -#: model:ir.module.module,shortdesc:base_iban.module_meta_information -#: field:res.partner.bank,iban:0 -msgid "IBAN" -msgstr "IBAN" diff --git a/addons/base_module_merge/i18n/fr_FR.po b/addons/base_module_merge/i18n/fr_FR.po index d1e20e3a889..c57c274c83f 100644 --- a/addons/base_module_merge/i18n/fr_FR.po +++ b/addons/base_module_merge/i18n/fr_FR.po @@ -6,14 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-19 14:22:20+0000\n" -"PO-Revision-Date: 2009-05-20 10:22:20+0000\n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-04-10 12:03+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" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-07-07 11:15+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: base_module_merge #: wizard_field:base_module_merge.module_merge,info,category:0 @@ -132,7 +133,10 @@ msgstr "" #. module: base_module_merge #: wizard_view:base_module_merge.module_merge,save:0 -msgid "If you think your module could interrest others people, we'd like you to publish it on OpenERP.com, in the 'Modules' section. You can do it through the website or using features of the 'base_module_publish' module." +msgid "" +"If you think your module could interrest others people, we'd like you to " +"publish it on OpenERP.com, in the 'Modules' section. You can do it through " +"the website or using features of the 'base_module_publish' module." msgstr "" #. module: base_module_merge @@ -160,4 +164,3 @@ msgstr "" #: wizard_button:base_module_merge.module_merge,save,end:0 msgid "Close" msgstr "" - diff --git a/addons/base_module_publish/i18n/fr_FR.po b/addons/base_module_publish/i18n/fr_FR.po index 67b97de0646..35b6f22f6f2 100644 --- a/addons/base_module_publish/i18n/fr_FR.po +++ b/addons/base_module_publish/i18n/fr_FR.po @@ -6,14 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-19 14:22:20+0000\n" -"PO-Revision-Date: 2009-05-20 10:22:20+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-05-20 14:45+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-07-07 11:05+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: base_module_publish #: wizard_field:base_module_publish.module_publish,step1,category:0 @@ -135,8 +136,11 @@ msgstr "Description" #. module: base_module_publish #: wizard_view:base_module_publish.module_publish,step2:0 #: wizard_view:base_module_publish.module_publish_all,login:0 -msgid "If you don't have an access, you can create one http://www.openerp.com/" -msgstr "Si vous n'avez pas d'accès, vous pouvez en créer un sur http://www.openerp.com/" +msgid "" +"If you don't have an access, you can create one http://www.openerp.com/" +msgstr "" +"Si vous n'avez pas d'accès, vous pouvez en créer un sur " +"http://www.openerp.com/" #. module: base_module_publish #: wizard_view:base_module_publish.module_publish,init:0 @@ -361,4 +365,3 @@ msgstr "Publier le module" #: wizard_button:base_module_publish.module_publish,step2,step1:0 msgid "Previous" msgstr "Précédent" - diff --git a/addons/base_module_quality/pyflakes_test/pyflakes_test.py b/addons/base_module_quality/pyflakes_test/pyflakes_test.py index 635d4364dcb..bc649f26b52 100644 --- a/addons/base_module_quality/pyflakes_test/pyflakes_test.py +++ b/addons/base_module_quality/pyflakes_test/pyflakes_test.py @@ -67,7 +67,7 @@ class quality_test(base_module_quality.abstract_quality_check): return None if not res: continue - self.result_details += '''
''' + file_py + '' + self.result_details += '''
' + self.result_details += '
''' + file_py + '' list_res = res.split('\n') temp_dict = {} keys = ['imported but unused statements', 'unable to detect undefined names', \ @@ -78,7 +78,10 @@ class quality_test(base_module_quality.abstract_quality_check): map(lambda key:temp_dict.setdefault(key, 0), keys) detail_str = '' for line in list_res: - self.result_details += '''' + line = line.split(':') + line.pop(0) + line = " ".join(line) + self.result_details += '''' detail_str += line + '\n' if line.find("imported but unused") != -1: temp_dict['imported but unused statements'] += 1 @@ -110,7 +113,7 @@ class quality_test(base_module_quality.abstract_quality_check): dict_py[file_py] = [file_py, final_str] except: dict_py[file_py] = [file_py, _("Unable to parse the result. Check the details.")] - self.result_details += '
''' + line + '
''' + line + '
' if not flag: self.error = True self.result = _("No python file found") @@ -126,4 +129,4 @@ class quality_test(base_module_quality.abstract_quality_check): return self.format_table(header, data_list=dict_py) return "" -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py index ac460dabbc0..b77027bbda2 100644 --- a/addons/base_module_record/base_module_record.py +++ b/addons/base_module_record/base_module_record.py @@ -25,16 +25,17 @@ from osv import fields,osv import netsvc import pooler import string +import tools -installed = False +objects_proxy = netsvc.SERVICES['object'].__class__ -def fnct_call(fnct): - def execute(*args, **argv): +class recording_objects_proxy(objects_proxy): + def execute(self, *args, **argv): if len(args) >= 6 and isinstance(args[5], dict): _old_args = args[5].copy() else: _old_args = None - res = fnct(*args, **argv) + res = super(recording_objects_proxy, self).execute(*args, **argv) pool = pooler.get_pool(args[0]) mod = pool.get('ir.module.record') if mod and mod.recording: @@ -44,39 +45,28 @@ def fnct_call(fnct): if args[5]: mod.recording_data.append(('query', args, argv,res)) return res - return execute -def fnct_call_workflow(fnct): - def exec_workflow(*args, **argv): - res = fnct(*args, **argv) + def exec_workflow(self, *args, **argv): + res = super(recording_objects_proxy, self).exec_workflow(*args, **argv) pool = pooler.get_pool(args[0]) mod = pool.get('ir.module.record') if mod and mod.recording: mod.recording_data.append(('workflow', args, argv)) return res - return exec_workflow + +recording_objects_proxy() + class base_module_record(osv.osv): _name = "ir.module.record" _columns = { } - def __init__(self, pool, cr=None): - global installed - if super(base_module_record, self).__init__.func_code.co_argcount ==3: - super(base_module_record, self).__init__(pool,cr) - else: - super(base_module_record, self).__init__(pool) + def __init__(self, *args, **kwargs): self.recording = 0 self.recording_data = [] self.depends = {} - if not installed: - obj = netsvc.SERVICES['object'] - obj.execute = fnct_call(obj.execute) - obj.exportMethod(obj.execute) - obj.exec_workflow = fnct_call_workflow(obj.exec_workflow) - obj.exportMethod(obj.exec_workflow) - installed = True + super(base_module_record, self).__init__(*args, **kwargs) # To Be Improved def _create_id(self, cr, uid, model, data): @@ -138,8 +128,9 @@ class base_module_record(osv.osv): noupdate = noupdate or update if not id: field.setAttribute("model", fields[key]['relation']) - name = self.pool.get(fields[key]['relation']).browse(cr, uid, val).name - field.setAttribute("search", "[('name','=','"+name+"')]") + fld_nm = self.pool.get(fields[key]['relation'])._rec_name + name = self.pool.get(fields[key]['relation']).read(cr, uid, val,[fld_nm])[fld_nm] or False + field.setAttribute("search", str([(str(fld_nm) ,'=', name)])) else: field.setAttribute("ref", id) record.appendChild(field) @@ -185,7 +176,7 @@ class base_module_record(osv.osv): val = str(val) val = val and ('"""%s"""' % val.replace('\\', '\\\\').replace('"', '\"')) or 'False' - field.setAttribute(u"eval", val.decode('utf-8')) + field.setAttribute(u"eval", tools.ustr(val)) record.appendChild(field) return record_list, noupdate diff --git a/addons/base_module_record/i18n/fr_FR.po b/addons/base_module_record/i18n/fr_FR.po index a28fbac24ad..84468d0ba80 100644 --- a/addons/base_module_record/i18n/fr_FR.po +++ b/addons/base_module_record/i18n/fr_FR.po @@ -6,14 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-19 14:22:20+0000\n" -"PO-Revision-Date: 2009-05-20 10:22:20+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-05-20 13:59+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-07-07 11:10+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,intro,category:0 @@ -35,8 +36,11 @@ msgstr "ir.module.record" #. module: base_module_record #: constraint:ir.model:0 -msgid "The Object name must start with x_ and not contain any special character !" -msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !" +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères " +"spéciaux !" #. module: base_module_record #: wizard_view:base_module_record.module_record_objects,init:0 @@ -244,13 +248,27 @@ msgstr "OK" #. module: base_module_record #: wizard_view:base_module_record.module_record_objects,save:0 #: wizard_view:base_module_record.module_save,save:0 -msgid "If you think your module could interrest others people, we'd like you to publish it on OpenERP.com, in the 'Modules' section. You can do it through the website or using features of the 'base_module_publish' module." -msgstr "Si vous pensez que votre module peut interresser d'autres personnes, nou aimerions que vous le publiez sur OpenERP.com dans la section 'Modules'. Vous pouvez le faire par le site internet ou en utilisant les fonctionnalités du module 'base_module_publish'." +msgid "" +"If you think your module could interrest others people, we'd like you to " +"publish it on OpenERP.com, in the 'Modules' section. You can do it through " +"the website or using features of the 'base_module_publish' module." +msgstr "" +"Si vous pensez que votre module peut interresser d'autres personnes, nou " +"aimerions que vous le publiez sur OpenERP.com dans la section 'Modules'. " +"Vous pouvez le faire par le site internet ou en utilisant les " +"fonctionnalités du module 'base_module_publish'." #. module: base_module_record #: wizard_view:base_module_record.module_record,start:0 -msgid "The module recorder allows you to record every operation made in the Open ERP client and save them as a module. You will be able to install this module on any database to reuse and/or publish it." -msgstr "Le module recorder vous permet d'enregistrer toutes les manipulations effectuées dans le client OpenERP et de sauvegarder le tout dans un module. Vous serez capable d'installer ce module sur toutes vos bases de données et/ou de le publier." +msgid "" +"The module recorder allows you to record every operation made in the Open " +"ERP client and save them as a module. You will be able to install this " +"module on any database to reuse and/or publish it." +msgstr "" +"Le module recorder vous permet d'enregistrer toutes les manipulations " +"effectuées dans le client OpenERP et de sauvegarder le tout dans un module. " +"Vous serez capable d'installer ce module sur toutes vos bases de données " +"et/ou de le publier." #. module: base_module_record #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record @@ -264,8 +282,12 @@ msgstr "Création de module" #. module: base_module_record #: wizard_view:base_module_record.module_record,stop:0 -msgid "You can continue the recording session by relauching the 'start recording' wizard." -msgstr "Vous pouvez continuer la session d'enregistrement en relançant l'assisant \"Commencer l'enregistrement\"" +msgid "" +"You can continue the recording session by relauching the 'start recording' " +"wizard." +msgstr "" +"Vous pouvez continuer la session d'enregistrement en relançant l'assisant " +"\"Commencer l'enregistrement\"" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,intro,data_kind:0 @@ -287,8 +309,11 @@ msgstr "Sauvegarder le Module Enregistré" #. module: base_module_record #: wizard_view:base_module_record.module_record,stop:0 -msgid "Open ERP recording is stopped. Don't forget to save the recorded module." -msgstr "L'enregistrement OpenERP est arreté. N'oublier pas de sauvegarder le module enregistré." +msgid "" +"Open ERP recording is stopped. Don't forget to save the recorded module." +msgstr "" +"L'enregistrement OpenERP est arreté. N'oublier pas de sauvegarder le module " +"enregistré." #. module: base_module_record #: wizard_button:base_module_record.module_record,start,end:0 @@ -314,4 +339,3 @@ msgstr "Créer & Modifier" #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_stop msgid "Stop Recording" msgstr "Arrêter l'enregistrement" - diff --git a/addons/base_report_creator/i18n/fr_FR.po b/addons/base_report_creator/i18n/fr_FR.po index b60c5d7dc76..dd426050434 100644 --- a/addons/base_report_creator/i18n/fr_FR.po +++ b/addons/base_report_creator/i18n/fr_FR.po @@ -6,18 +6,21 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-19 14:22:20+0000\n" -"PO-Revision-Date: 2009-05-20 10:22:20+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-05-20 12:38+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-07-07 11:23+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: base_report_creator #: help:base_report_creator.report.filter,expression:0 -msgid "Provide an expression for the field based on which you want to filter the records.\n" +msgid "" +"Provide an expression for the field based on which you want to filter the " +"records.\n" " e.g. res_partner.id=3" msgstr "" @@ -44,7 +47,9 @@ msgstr "Mode Graphe" #. module: base_report_creator #: code:addons/base_report_creator/base_report_creator.py:0 #, python-format -msgid "These is/are model(s) (%s) in selection which is/are not related to any other model" +msgid "" +"These is/are model(s) (%s) in selection which is/are not related to any " +"other model" msgstr "" #. module: base_report_creator @@ -364,8 +369,11 @@ msgstr "Annuler" #. module: base_report_creator #: constraint:ir.model:0 -msgid "The Object name must start with x_ and not contain any special character !" -msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !" +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères " +"spéciaux !" #. module: base_report_creator #: field:base_report_creator.report,view_type1:0 @@ -399,13 +407,13 @@ msgstr "Troisième vue" #. module: base_report_creator #: model:ir.module.module,description:base_report_creator.module_meta_information -msgid "This modules allows you to create any statistic\n" +msgid "" +"This modules allows you to create any statistic\n" "report on several object. It's a SQL query builder and browser\n" "for and users.\n" "\n" "After installing the module, it adds a menu to define custom report in\n" "the \"Dashboard\" menu.\n" -"" msgstr "" #. module: base_report_creator @@ -489,4 +497,3 @@ msgstr "Champs à Afficher" #: field:base_report_creator.report,filter_ids:0 msgid "Filters" msgstr "Filtres" - diff --git a/addons/base_report_designer/i18n/fr_FR.po b/addons/base_report_designer/i18n/fr_FR.po index 6bcee7b6e3d..191b916968e 100644 --- a/addons/base_report_designer/i18n/fr_FR.po +++ b/addons/base_report_designer/i18n/fr_FR.po @@ -8,12 +8,12 @@ msgstr "" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-05-19 14:36+0000\n" "PO-Revision-Date: 2009-06-12 13:40+0000\n" -"Last-Translator: Olivier (OpenERP) \n" +"Last-Translator: Olivier (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-06-12 14:04+0000\n" +"X-Launchpad-Export-Date: 2009-07-07 11:20+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_report_designer diff --git a/addons/base_setup/i18n/fr_FR.po b/addons/base_setup/i18n/fr_FR.po index abefdc4bfbd..43a7089bc42 100644 --- a/addons/base_setup/i18n/fr_FR.po +++ b/addons/base_setup/i18n/fr_FR.po @@ -8,12 +8,12 @@ msgstr "" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-05-19 14:36+0000\n" "PO-Revision-Date: 2009-06-12 13:23+0000\n" -"Last-Translator: Olivier (OpenERP) \n" +"Last-Translator: Olivier (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-06-12 13:44+0000\n" +"X-Launchpad-Export-Date: 2009-07-07 11:11+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_setup diff --git a/addons/base_vat/i18n/fr_FR.po b/addons/base_vat/i18n/fr_FR.po index eb99094f132..52fdd42f37a 100644 --- a/addons/base_vat/i18n/fr_FR.po +++ b/addons/base_vat/i18n/fr_FR.po @@ -6,18 +6,20 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-19 14:22:20+0000\n" -"PO-Revision-Date: 2009-05-20 10:22:20+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-05-20 13:49+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-07-07 11:11+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: base_vat #: model:ir.module.module,description:base_vat.module_meta_information -msgid "Enable the VAT Number for the partner. Check the validity of that VAT Number." +msgid "" +"Enable the VAT Number for the partner. Check the validity of that VAT Number." msgstr "" #. module: base_vat @@ -34,4 +36,3 @@ msgstr "" #: model:ir.module.module,shortdesc:base_vat.module_meta_information msgid "VAT" msgstr "" - diff --git a/addons/board/i18n/fr_FR.po b/addons/board/i18n/fr_FR.po index fb0df08cf40..c7e8ee78dd6 100644 --- a/addons/board/i18n/fr_FR.po +++ b/addons/board/i18n/fr_FR.po @@ -8,12 +8,12 @@ msgstr "" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-05-19 14:36+0000\n" "PO-Revision-Date: 2009-06-12 14:32+0000\n" -"Last-Translator: Olivier (OpenERP) \n" +"Last-Translator: Olivier (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-06-12 15:00+0000\n" +"X-Launchpad-Export-Date: 2009-07-07 11:22+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: board diff --git a/addons/board_account/i18n/fr_FR.po b/addons/board_account/i18n/fr_FR.po index e6cfd0fba7a..ec4c6636c6f 100644 --- a/addons/board_account/i18n/fr_FR.po +++ b/addons/board_account/i18n/fr_FR.po @@ -4,16 +4,17 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.1\n" +"Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-19 14:22:20+0000\n" -"PO-Revision-Date: 2009-05-20 10:22:20+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-07-07 13:44+0000\n" +"Last-Translator: Olivier (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-07-07 14:16+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: board_account #: view:board.board:0 @@ -61,7 +62,7 @@ msgstr "Creances âgés" #. module: board_account #: model:ir.module.module,shortdesc:board_account.module_meta_information msgid "Board for accountant" -msgstr "" +msgstr "Tableau de bord du comptable" #. module: board_account #: model:ir.actions.act_window,name:board_account.action_aged_income @@ -76,7 +77,7 @@ msgstr "Mes indicateurs" #. module: board_account #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nom du model invalide pour la définition de l'action." #. module: board_account #: model:ir.ui.menu,name:board_account.next_id_68 @@ -86,10 +87,9 @@ msgstr "Comptabilité" #. module: board_account #: view:board.board:0 msgid "Account Board" -msgstr "" +msgstr "Tableau de bord de la comptabilité" #. module: board_account #: view:board.board:0 msgid "Aged income" msgstr "Revenus âgés" - diff --git a/addons/board_association/i18n/fr_FR.po b/addons/board_association/i18n/fr_FR.po index e86b1e55b24..c53859bb27e 100644 --- a/addons/board_association/i18n/fr_FR.po +++ b/addons/board_association/i18n/fr_FR.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-04-09 17:23+0000\n" -"PO-Revision-Date: 2009-07-06 13:05+0000\n" -"Last-Translator: Olivier (OpenERP) \n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-06-12 13:41+0000\n" +"Last-Translator: Olivier (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-07-06 13:24+0000\n" +"X-Launchpad-Export-Date: 2009-07-07 11:06+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: board_association @@ -21,6 +21,11 @@ msgstr "" msgid "Associations" msgstr "Associations" +#. module: board_association +#: model:ir.module.module,shortdesc:board_association.module_meta_information +msgid "Dashboard for Associations" +msgstr "Tableau de Bord pour les Associations" + #. module: board_association #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" @@ -47,6 +52,11 @@ msgstr "Nouveaux Membres" msgid "Unpaid Invoices" msgstr "Factures impayées" +#. module: board_association +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Nom du modèle non valide pour la définition de l'action." + #. module: board_association #: view:board.board:0 msgid "Next Events" @@ -56,8 +66,3 @@ msgstr "Prochains événements" #: view:board.board:0 msgid "Registrations by Events" msgstr "Inscriptions par événement" - -#. module: board_association -#: model:ir.module.module,shortdesc:board_association.module_meta_information -msgid "Dashboard for Associations" -msgstr "Tableau de Bord pour les Associations" diff --git a/addons/board_auction/i18n/fr_FR.po b/addons/board_auction/i18n/fr_FR.po index 2ac6ab2b2f9..ecb48838c7c 100644 --- a/addons/board_auction/i18n/fr_FR.po +++ b/addons/board_auction/i18n/fr_FR.po @@ -6,14 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-19 14:22:20+0000\n" -"PO-Revision-Date: 2009-05-20 10:22:20+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-05-20 14:50+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-07-07 11:06+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: board_auction #: constraint:ir.ui.view:0 @@ -119,4 +120,3 @@ msgstr "Min/Adj/Max" #: view:board.board:0 msgid "My Latest Objects" msgstr "Mes Derniers Objets" - diff --git a/addons/board_crm_configuration/i18n/fr_FR.po b/addons/board_crm_configuration/i18n/fr_FR.po index c2c297df3bd..945cd9b5f60 100644 --- a/addons/board_crm_configuration/i18n/fr_FR.po +++ b/addons/board_crm_configuration/i18n/fr_FR.po @@ -6,14 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-19 14:22:20+0000\n" -"PO-Revision-Date: 2009-05-20 10:22:20+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-05-20 12:57+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-07-07 11:11+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: board_crm_configuration #: model:ir.module.module,shortdesc:board_crm_configuration.module_meta_information @@ -116,4 +117,3 @@ msgstr "" #: view:board.board:0 msgid "My Leads" msgstr "Mes affaires" - diff --git a/addons/board_document/i18n/fr_FR.po b/addons/board_document/i18n/fr_FR.po index f9bf4a29c3b..8907f1bf21e 100644 --- a/addons/board_document/i18n/fr_FR.po +++ b/addons/board_document/i18n/fr_FR.po @@ -6,14 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-19 14:22:20+0000\n" -"PO-Revision-Date: 2009-05-20 10:22:20+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-05-20 13:55+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-07-07 11:16+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: board_document #: constraint:ir.ui.view:0 @@ -86,4 +87,3 @@ msgstr "Fichiers par Utilisateur" #: view:board.board:0 msgid "Document board" msgstr "Tableau des Documents" - diff --git a/addons/board_manufacturing/i18n/fr_FR.po b/addons/board_manufacturing/i18n/fr_FR.po index e244ace8742..4d50e0f1841 100644 --- a/addons/board_manufacturing/i18n/fr_FR.po +++ b/addons/board_manufacturing/i18n/fr_FR.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-04-09 17:23+0000\n" -"PO-Revision-Date: 2009-07-06 13:12+0000\n" -"Last-Translator: Olivier (OpenERP) \n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-05-20 13:38+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-07-06 13:44+0000\n" +"X-Launchpad-Export-Date: 2009-07-07 11:08+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: board_manufacturing @@ -31,6 +31,11 @@ msgstr "Ordre de fabrication suivant" msgid "Invalid XML for View Architecture!" msgstr "XML non valide pour l'architecture de la vue" +#. module: board_manufacturing +#: view:board.board:0 +msgid "Deliveries (Out packing)" +msgstr "" + #. module: board_manufacturing #: view:board.board:0 msgid "Manufacturing board" @@ -42,9 +47,9 @@ msgid "Production" msgstr "Gestion de la production" #. module: board_manufacturing -#: view:board.board:0 -msgid "Deliveries (Out packing)" -msgstr "Livraisons" +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "" #. module: board_manufacturing #: model:ir.actions.act_window,name:board_manufacturing.open_board_manufacturing @@ -52,6 +57,11 @@ msgstr "Livraisons" msgid "Production Dashboard" msgstr "Tableau de bord de production" +#. module: board_manufacturing +#: model:ir.module.module,shortdesc:board_manufacturing.module_meta_information +msgid "Board for manufacturing" +msgstr "" + #. module: board_manufacturing #: view:board.board:0 msgid "Stock value variation" @@ -61,8 +71,3 @@ msgstr "Variation de la valeur du stock" #: view:board.board:0 msgid "Workcenter futur load" msgstr "Charge future du poste de charge" - -#. module: board_manufacturing -#: model:ir.module.module,shortdesc:board_manufacturing.module_meta_information -msgid "Board for manufacturing" -msgstr "Tableau de Bord de la Production" diff --git a/addons/board_project/i18n/fr_FR.po b/addons/board_project/i18n/fr_FR.po index f104da1fa6a..3262bd86aca 100644 --- a/addons/board_project/i18n/fr_FR.po +++ b/addons/board_project/i18n/fr_FR.po @@ -6,14 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-05-19 14:22:20+0000\n" -"PO-Revision-Date: 2009-05-20 10:22:20+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-05-20 11:57+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-07-07 11:11+0000\n" +"X-Generator: Launchpad (build Unknown)\n" #. module: board_project #: view:board.board:0 @@ -136,4 +137,3 @@ msgstr "Mon pipeline" #: view:board.board:0 msgid "My Timesheet" msgstr "" - diff --git a/addons/board_sale/i18n/fr_FR.po b/addons/board_sale/i18n/fr_FR.po index f8d64446cee..500fb2ea4c8 100644 --- a/addons/board_sale/i18n/fr_FR.po +++ b/addons/board_sale/i18n/fr_FR.po @@ -4,18 +4,23 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.1\n" +"Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-04-09 17:23+0000\n" -"PO-Revision-Date: 2009-07-06 13:08+0000\n" -"Last-Translator: Olivier (OpenERP) \n" +"POT-Creation-Date: 2009-05-19 14:36+0000\n" +"PO-Revision-Date: 2009-07-07 13:44+0000\n" +"Last-Translator: Olivier (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-07-06 13:36+0000\n" +"X-Launchpad-Export-Date: 2009-07-07 14:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" +#. module: board_sale +#: model:ir.module.module,shortdesc:board_sale.module_meta_information +msgid "Dashboard for sales" +msgstr "Tableau de Bord des Ventes" + #. module: board_sale #: model:ir.actions.act_window,name:board_sale.open_board_sales_manager #: model:ir.ui.menu,name:board_sale.menu_board_sales_manager @@ -47,6 +52,11 @@ msgstr "XML non valide pour l'architecture de la vue" msgid "My open quotations" msgstr "Mes Devis Ouverts" +#. module: board_sale +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Nom du model invalide pour la définition de l'action." + #. module: board_sale #: model:ir.ui.menu,name:board_sale.next_id_88 msgid "Sales" @@ -61,8 +71,3 @@ msgstr "Statistiques des Cas" #: view:board.board:0 msgid "Top ten sales of the month" msgstr "10 meilleures Ventes du Mois" - -#. module: board_sale -#: model:ir.module.module,shortdesc:board_sale.module_meta_information -msgid "Dashboard for sales" -msgstr "Tableau de Bord des Ventes" diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 959420dbfc1..e42c0a4a455 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -520,6 +520,7 @@ class crm_case(osv.osv): 'case_id': case.id, 'case_subject': case.name, 'case_date': case.date, + 'case_description': case.description, 'case_user': (case.user_id and case.user_id.name) or '/', 'case_user_email': (case.user_id and case.user_id.address_id and case.user_id.address_id.email) or '/', diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index 964abe153c2..3b425ba0f3c 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -172,6 +172,7 @@