diff --git a/addons/account/i18n/fr_FR.po b/addons/account/i18n/fr_FR.po index 44b04216f68..3fa59da7dcd 100644 --- a/addons/account/i18n/fr_FR.po +++ b/addons/account/i18n/fr_FR.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.0\n" +"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" @@ -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 "Ecritures non-lettrées" +msgstr "Écritures non réconcilié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 "Ecritures non-lettrées" +msgstr "Écritures non réconcilié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 entrée postée dans ce journal !\n" +"Vous ne pouvez pas modifier une écriture 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 "Ecritures réccurentes" +msgstr "Écritures 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 un journal cloturé." +msgstr "Vous ne pouvez pas ajouter/modifier les écritures dans 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 "Ecritures par état" +msgstr "Écritures 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 "Entrée standard" +msgstr "Écriture 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'entrée" +msgstr "Calculer les dates d'Écriture" #. 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 lettrées" +msgstr "Écritures non réconcilié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 "Ecritures lettrées" +msgstr "Écritures réconcilié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 "Entrées du relevé" +msgstr "Écritures 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à lettrées !" +msgstr "Des écritures semblent déjà réconcilié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 "Ecritures lettrées" +msgstr "Écritures réconcilié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 entrées " +"Cochez cette case si vous voulez que l'utilisateur réconcilie les Écritures " "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'entrées, " +"dans Open ERP: les \"vues\" ne peuvent pas posséder d'écriture, " "\"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 entrées" +msgstr "Depuis le relevé, créer des Écritures" #. 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'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 " +"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 " "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'entrée." +msgstr "Le mouvement de cette ligne d'écriture." #. 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 entrées de comptes brouillon dans ce journal et cette période " +"Toutes les écritures 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 entrée " +"Le montant exprimé dans une autre devise optionnelle si c'est une écriture " "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 "" +msgstr "Taxes globales définies, mais elles ne sont pas dans les lignes de facture !" #. 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'entrées à réconcilier !" +msgstr "L'ancienne année fiscale n'a pas d'écriture à 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'entrée comme un " +"Vous pouvez cocher cette boîte pour marquer la ligne d'écriture 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'entrée." +"mettre la date limite pour le règlement de cette ligne d'écriture." #. 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 entrées comptable récurrentes" +msgstr "Ceci est un modèle pour des écritures 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 entrées" +msgstr "La quantité optionelle des écritures" #. 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 "Entrées analytiques par journal" +msgstr "Écritures 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 "Entrées valides de la Facture" +msgstr "Écritures 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 "" +msgstr "Crédit Général" #. 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 entrée de ce journal ne créera " +"Cochez cette case pour spécifier que chaque écriture 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 entrées" +msgstr "Nom des nouvelles écritures" #. 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 entrée multi devise." +msgstr "L'autre devise optionelle si c'est une écriture 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 entrées de compte" +msgstr "Toutes les écritures 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'Entrée Partielle" +msgstr "Lignes d'Écriture 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 "Entrées Ouvertes" +msgstr "Écritures 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 Entrées Créées" +msgstr "Omettre l'état 'Brouillon' pour les Écritures 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 Entrées du Compte" +msgstr "Valider les Écritures 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 "Entrées des Journaux Analytiques Ouverts" +msgstr "Écritures 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 "Entrées triées par" +msgstr "Écritures 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 Entrées." +msgstr "Réconcilier les Écritures." #. module: account #: field:account.subscription.line,move_id:0 msgid "Entry" -msgstr "Entrée" +msgstr "Écriture" #. 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 "" +msgstr "Compte de Dépense sur les Modèles de Produits" #. module: account #: rml:account.analytic.account.analytic.check:0 msgid "General Debit" -msgstr "" +msgstr "Débit Général" #. 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 entrées dans ce " +"Cochez cette case si l'utilisateur peut réconcilier les Écritures dans ce " "compte." #. module: account diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 37a73adfea4..6ec083ac7cb 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -921,7 +921,7 @@ class account_invoice_line(osv.osv): if 'check_total' in context: t = context['check_total'] for l in context.get('invoice_line', {}): - if len(l) >= 3 and l[2]: + if isinstance(l, (list, tuple)) and len(l) >= 3 and l[2]: tax_obj = self.pool.get('account.tax') p = l[2].get('price_unit', 0) * (1-l[2].get('discount', 0)/100.0) t = t - (p * l[2].get('quantity')) diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml index 10d50610720..cb6d549a7bd 100644 --- a/addons/account/report/invoice.rml +++ b/addons/account/report/invoice.rml @@ -404,13 +404,13 @@ - + Fiscal Position Remark : - [[ o.fiscal_position and format(o.fiscal_position.note) or removeParentNode('blockTable') ]] + [[ format(o.fiscal_position and o.fiscal_position.note or removeParentNode('blockTable')) ]] diff --git a/addons/account/report/tax_report.py b/addons/account/report/tax_report.py index 79e59959d12..1f0332d2906 100644 --- a/addons/account/report/tax_report.py +++ b/addons/account/report/tax_report.py @@ -43,20 +43,6 @@ class tax_report(rml_parse.rml_parse): }) - def comma_me(self,amount): - - if type(amount) is float : - amount = str('%.2f'%amount) - else : - amount = str(amount) - if (amount == '0'): - return ' ' - orig = amount - new = re.sub("^(-?\d+)(\d{3})", "\g<1>'\g<2>", amount) - if orig == new: - return new - else: - return self.comma_me(new) def _get_lines(self, based_on,period_list,company_id=False, parent=False, level=0): res = self._get_codes(based_on,company_id,parent,level,period_list) @@ -73,7 +59,6 @@ class tax_report(rml_parse.rml_parse): i = 0 top_result = [] - while i < len(res): res_dict = { 'code' : res[i][1].code, @@ -106,7 +91,6 @@ class tax_report(rml_parse.rml_parse): def _get_general(self, tax_code_id,period_list ,company_id, based_on): res=[] period_sql_list = ','.join(map(str, period_list[0][2])) - if based_on == 'payments': self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \ SUM(line.debit) AS debit, \ @@ -125,6 +109,7 @@ class tax_report(rml_parse.rml_parse): AND line.account_id = account.id \ AND account.company_id = %s \ AND move.id = line.move_id \ + AND line.period_id IN ('+ period_sql_list +') \ AND ((invoice.state = %s) \ OR (invoice.id IS NULL)) \ GROUP BY account.id,account.name,account.code', ('draft',tax_code_id, @@ -144,6 +129,7 @@ class tax_report(rml_parse.rml_parse): AND line.tax_code_id = %s \ AND line.account_id = account.id \ AND account.company_id = %s \ + AND line.period_id IN ('+ period_sql_list +') \ AND account.active \ GROUP BY account.id,account.name,account.code', ('draft',tax_code_id, company_id)) diff --git a/addons/account/wizard/wizard_account_chart.py b/addons/account/wizard/wizard_account_chart.py index f60dfdcf0a2..124a8146c34 100644 --- a/addons/account/wizard/wizard_account_chart.py +++ b/addons/account/wizard/wizard_account_chart.py @@ -41,7 +41,7 @@ class wizard_account_chart(wizard.interface): 'target_move': { 'string': 'Target Moves', 'type': 'selection', - 'selection': [('all','All Entries'),('posted_only','All Posted Entries')], + 'selection': [('all','All Entries'),('posted','All Posted Entries')], 'required': True, 'default': lambda *a:"all", }, @@ -60,7 +60,7 @@ class wizard_account_chart(wizard.interface): result = mod_obj._get_id(cr, uid, 'account', 'action_account_tree') id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id'] result = act_obj.read(cr, uid, [id], context=context)[0] - result['context'] = str({'fiscalyear': data['form']['fiscalyear'],'target_move':data['form']['target_move']}) + result['context'] = str({'fiscalyear': data['form']['fiscalyear'],'state':data['form']['target_move']}) if data['form']['fiscalyear']: result['name']+=':'+pooler.get_pool(cr.dbname).get('account.fiscalyear').read(cr,uid,[data['form']['fiscalyear']])[0]['code'] return result diff --git a/addons/account_analytic_analysis/i18n/fr_FR.po b/addons/account_analytic_analysis/i18n/fr_FR.po index 75e5ad8e596..7e8c4ca7d3c 100644 --- a/addons/account_analytic_analysis/i18n/fr_FR.po +++ b/addons/account_analytic_analysis/i18n/fr_FR.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.0\n" +"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 10:58+0000\n" diff --git a/addons/account_analytic_default/i18n/fr_FR.po b/addons/account_analytic_default/i18n/fr_FR.po index 4c0b26ef744..9e725596de8 100644 --- a/addons/account_analytic_default/i18n/fr_FR.po +++ b/addons/account_analytic_default/i18n/fr_FR.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.0\n" +"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 11:00+0000\n" diff --git a/addons/account_analytic_plans/i18n/fr_FR.po b/addons/account_analytic_plans/i18n/fr_FR.po index 2be68407c42..2905868e4ed 100644 --- a/addons/account_analytic_plans/i18n/fr_FR.po +++ b/addons/account_analytic_plans/i18n/fr_FR.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.0\n" +"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" diff --git a/addons/account_balance/i18n/fr_FR.po b/addons/account_balance/i18n/fr_FR.po index d065829b8a3..d5d563ecbdc 100644 --- a/addons/account_balance/i18n/fr_FR.po +++ b/addons/account_balance/i18n/fr_FR.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.0\n" +"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 11:29+0000\n" diff --git a/addons/account_budget/i18n/fr_FR.po b/addons/account_budget/i18n/fr_FR.po index 586294550ef..ad2abbb9352 100644 --- a/addons/account_budget/i18n/fr_FR.po +++ b/addons/account_budget/i18n/fr_FR.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.0\n" +"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 11:10+0000\n" diff --git a/addons/account_chart/i18n/fr_FR.po b/addons/account_chart/i18n/fr_FR.po index f578466455a..793e6bafba2 100644 --- a/addons/account_chart/i18n/fr_FR.po +++ b/addons/account_chart/i18n/fr_FR.po @@ -4,16 +4,16 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.0\n" +"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 13:12+0000\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" "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:24+0000\n" +"X-Launchpad-Export-Date: 2009-07-06 13:16+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 4536f6e6d00..f59cf066c15 100644 --- a/addons/account_date_check/i18n/fr_FR.po +++ b/addons/account_date_check/i18n/fr_FR.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.0\n" +"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 13:15+0000\n" diff --git a/addons/account_invoice_layout/i18n/fr_FR.po b/addons/account_invoice_layout/i18n/fr_FR.po index 67bddc2a16d..d92ce2d43d2 100644 --- a/addons/account_invoice_layout/i18n/fr_FR.po +++ b/addons/account_invoice_layout/i18n/fr_FR.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.0\n" +"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 13:09+0000\n" diff --git a/addons/account_report/i18n/fr_FR.po b/addons/account_report/i18n/fr_FR.po index c1edd3d3d8d..a0fba03f1eb 100644 --- a/addons/account_report/i18n/fr_FR.po +++ b/addons/account_report/i18n/fr_FR.po @@ -1,545 +1,242 @@ # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * account_report +# * account_reporting # 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-04-09 17:23+0000\n" +"PO-Revision-Date: 2009-07-06 13:35+0000\n" +"Last-Translator: Olivier (OpenERP) \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-06 14:04+0000\n" +"X-Generator: Launchpad (build Unknown)\n" -#. 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 +#: field:color.rml,code:0 +msgid "code" +msgstr "code" -#. 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." +#. 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 !" -#. module: account_report -#: view:account.report.report:0 -msgid "Operators:" -msgstr "Opérateurs" +#. module: account_reporting +#: selection:account.report.bs,font_style:0 +msgid "Helvetica-Bold" +msgstr "Helvetica-Bold" -#. module: account_report -#: field:account.report.report,parent_id:0 -msgid "Parent" -msgstr "Parent" +#. module: account_reporting +#: selection:account.report.bs,font_style:0 +msgid "Helvetica" +msgstr "Helvetica" -#. module: account_report -#: field:account.report.report,disp_graph:0 -msgid "Display As Graph" +#. 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" msgstr "" +"Rapports financiers et comptables \n" +" Rapport de bilan" -#. module: account_report -#: view:account.report.report:0 -msgid "Account Debit:" -msgstr "" +#. module: account_reporting +#: selection:account.report.bs,font_style:0 +msgid "Courier-Oblique" +msgstr "Courier-Oblique" -#. 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 +#. 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 -#: 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 !" -msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !" - -#. module: account_report -#: help:account.report.report,goodness_limit:0 -msgid "This Value sets the limit of goodness." -msgstr "" - -#. 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_report -#: view:account.report.report:0 -msgid "+ - * / ( )" -msgstr "+ - * / ( )" - -#. 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 +#. module: account_reporting +#: field:account.report.bs,name:0 +#: field:color.rml,name:0 msgid "Name" msgstr "Nom" -#. module: account_report -#: wizard_field:print.indicators,next,base_selection:0 -msgid "Select Criteria" -msgstr "Sélectionnez les critères" +#. module: account_reporting +#: view:account.report.bs:0 +msgid "Account reporting" +msgstr "Rapport de compte" -#. 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 +#: 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 -#: view:account.report.report:0 -msgid "tax_code(['ACCOUNT_TAX_CODE',],period)" -msgstr "" +#. module: account_reporting +#: view:account.report.bs:0 +msgid "Notes" +msgstr "Notes" -#. module: account_report -#: field:account.report.history,fiscalyear_id:0 -msgid "Fiscal Year" -msgstr "Année Fiscale" +#. module: account_reporting +#: selection:account.report.bs,font_style:0 +msgid "Times-BoldItalic" +msgstr "Times-BoldItalic" -#. 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 +#: 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 -#: 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 "Courier-Bold" +msgstr "Courier-Bold" -#. module: account_report -#: rml:print.indicators:0 -msgid "Page" -msgstr "Page" +#. module: account_reporting +#: selection:account.report.bs,font_style:0 +msgid "Times-Italic" +msgstr "Times-Italic" -#. module: account_report -#: selection:account.report.report,type:0 -msgid "View" -msgstr "Vue" +#. module: account_reporting +#: selection:account.report.bs,report_type:0 +msgid "Report Objects Only" +msgstr "Rapport sur les objets seulement" -#. module: account_report -#: rml:print.indicators:0 -msgid "Indicators -" -msgstr "Indicateurs -" +#. module: account_reporting +#: model:ir.model,name:account_reporting.model_color_rml +msgid "Rml Colors" +msgstr "Couleurs RML" -#. 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 +#: 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 -#: view:account.report.report:0 -msgid "Return value for status" -msgstr "Valeur de retour pour status" +#. module: account_reporting +#: field:account.report.bs,code:0 +msgid "Code" +msgstr "Code" -#. module: account_report -#: field:account.report.report,sequence:0 +#. module: account_reporting +#: field:account.report.bs,parent_id:0 +msgid "Parent" +msgstr "Parent" + +#. module: account_reporting +#: field:account.report.bs,sequence:0 msgid "Sequence" msgstr "Séquence" -#. module: account_report -#: rml:accounting.report:0 -msgid "Amount" -msgstr "Montant" +#. module: account_reporting +#: selection:account.report.bs,font_style:0 +msgid "Times-Bold" +msgstr "Times-Bold" -#. module: account_report -#: rml:print.indicators:0 -msgid "1cm 27.7cm 20cm 27.7cm" -msgstr "1cm 27.7cm 20cm 27.7cm" +#. module: account_reporting +#: view:account.report.bs:0 +msgid "General" +msgstr "Général" -#. 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 +#: wizard_field:account.account.balancesheet.report,init,fiscalyear:0 +msgid "Fiscal year" +msgstr "Année fiscale" -#. module: account_report -#: selection:account.report.report,type:0 -msgid "Fiscal Statement" -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" diff --git a/addons/account_tax_include/i18n/fr_FR.po b/addons/account_tax_include/i18n/fr_FR.po index ece0547d517..eee7d6d0aa7 100644 --- a/addons/account_tax_include/i18n/fr_FR.po +++ b/addons/account_tax_include/i18n/fr_FR.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.0\n" +"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 13:37+0000\n" diff --git a/addons/account_tax_include/invoice_tax_incl.xml b/addons/account_tax_include/invoice_tax_incl.xml index 470a1ca0697..2da7895562f 100644 --- a/addons/account_tax_include/invoice_tax_incl.xml +++ b/addons/account_tax_include/invoice_tax_incl.xml @@ -21,7 +21,7 @@ account.invoice - + diff --git a/addons/analytic_journal_billing_rate/i18n/fr_FR.po b/addons/analytic_journal_billing_rate/i18n/fr_FR.po index 7f5c151972a..191f5c87e59 100644 --- a/addons/analytic_journal_billing_rate/i18n/fr_FR.po +++ b/addons/analytic_journal_billing_rate/i18n/fr_FR.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.0\n" +"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 13:38+0000\n" diff --git a/addons/base_iban/i18n/fr_FR.po b/addons/base_iban/i18n/fr_FR.po index 5f3b3f4e866..28cd3169ae4 100644 --- a/addons/base_iban/i18n/fr_FR.po +++ b/addons/base_iban/i18n/fr_FR.po @@ -4,16 +4,16 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.0\n" +"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 13:22+0000\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" "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:40+0000\n" +"X-Launchpad-Export-Date: 2009-07-06 13:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_iban @@ -46,12 +46,6 @@ 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" @@ -61,3 +55,9 @@ 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_quality/README.txt b/addons/base_module_quality/README.txt new file mode 100644 index 00000000000..3819448c9c1 --- /dev/null +++ b/addons/base_module_quality/README.txt @@ -0,0 +1,11 @@ +This module provide a generic framework to define your own quality test. + + +All you have to do is to: +* create a folder with your test in 'base_module_quality' (e.g: mkdir base_module_quality\mytest) +* create a .py file in it with same name as the folder you just created (e.g: touch base_module_quality\mytest\mytest.py) +* edit your file and define a class 'quality_check' that + * inherits the class 'abstract_quality_test' (defined in base_module_quality.py) + * implements the __init__() method accordingly to what you want to test. + + diff --git a/addons/base_module_quality/__init__.py b/addons/base_module_quality/__init__.py new file mode 100644 index 00000000000..1f0d6b5dbe7 --- /dev/null +++ b/addons/base_module_quality/__init__.py @@ -0,0 +1,26 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved +# $Id$ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +############################################################################## + +import base_module_quality +import wizard + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/base_module_quality/__terp__.py b/addons/base_module_quality/__terp__.py new file mode 100644 index 00000000000..9c16e9be300 --- /dev/null +++ b/addons/base_module_quality/__terp__.py @@ -0,0 +1,51 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved +# $Id$ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +############################################################################## + + +{ + 'name': 'Base module quality', + 'version': '1.0', + 'category': 'Tiny Specific Modules/Base module quality', + 'description': """ +This module's aim is to check the quality of other modules. + +It defines a wizard on the list of modules in OpenERP, which allow you to +evaluate them on different criteria such as: the respect of OpenERP coding +standards, the speed efficiency... + +This module also provides generic framework to define your own quality test. +For further info, coders may take a look into base_module_quality\README.txt + +WARNING: This module can not work as a ZIP file, you must unzip it before +using it, otherwise it may crash. + """, + 'author': 'Tiny', + 'website': 'http://www.openerp.com', + 'depends': ['base'], + 'init_xml': [], + 'update_xml': ['base_module_quality_wizard.xml', 'base_module_quality_view.xml', 'security/ir.model.access.csv'], + 'demo_xml': [], + 'installable': True, + 'active': False, + 'certificate': '0175119475677', +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_module_quality/base_module_quality.py b/addons/base_module_quality/base_module_quality.py new file mode 100644 index 00000000000..ec1a50adb4a --- /dev/null +++ b/addons/base_module_quality/base_module_quality.py @@ -0,0 +1,250 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved +# $Id$ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +############################################################################## +import os + +import pooler +import osv +import tools +from tools import config +from tools.translate import _ +from osv import osv, fields + +class abstract_quality_check(object): + ''' + This Class provides... + ''' + + def __init__(self): + ''' + this method should initialize the var + ''' + #This float have to store the rating of the module. + #Used to compute the final score (average of all scores). + #0 <= self.score <= 1 + self.score = 0.0 + + #This char have to store the name of the test. + self.name = "" + + #This char have to store the aim of the test and eventually a note. + self.note = "" + + #This char have to store the result. + #Used to display the result of the test. + self.result = "" + + #This char have to store the result with more details. + #Used to provide more details if necessary. + self.result_details = "" + + # This boolean variable defines that if you do not want to calculate score and just only need detail + # or summary report for some test then you will make it False. + self.bool_count_score = True + + #This bool defines if the test can be run only if the module + #is installed. + #True => the module have to be installed. + #False => the module can be uninstalled. + self.bool_installed_only = True + + #This variable is used to give result of test more weight, + #because some tests are more critical than others. + self.ponderation = 1.0 + + #Specify test got an error on module + self.error = False + + #The tests have to subscribe itselfs in this list, that contains + #all the test that have to be performed. + self.tests = [] + self.list_folders = os.listdir(config['addons_path'] + + '/base_module_quality/') + for item in self.list_folders: + self.item = item + path = config['addons_path']+'/base_module_quality/'+item + if os.path.exists(path + '/' + item + '.py') and item not in ['report', 'wizard', 'security']: + item2 = 'base_module_quality.' + item +'.' + item + x_module = __import__(item2) + x_file = getattr(x_module, item) + x_obj = getattr(x_file, item) + self.tests.append(x_obj) +# raise 'Not Implemented' + + def run_test(self, cr, uid, module_path=""): + ''' + this method should do the test and fill the score, result and result_details var + ''' + raise osv.except_osv(_('Programming Error'), _('Test Is Not Implemented')) + + def get_objects(self, cr, uid, module): + # This function returns all object of the given module.. + pool = pooler.get_pool(cr.dbname) + ids2 = pool.get('ir.model.data').search(cr, uid, + [('module', '=', module), ('model', '=', 'ir.model')]) + model_list = [] + model_data = pool.get('ir.model.data').browse(cr, uid, ids2) + for model in model_data: + model_list.append(model.res_id) + obj_list = [] + for mod in pool.get('ir.model').browse(cr, uid, model_list): + obj_list.append(str(mod.model)) + return obj_list + + def get_model_ids(self, cr, uid, models=[]): + # This function returns all ids of the given objects.. + if not models: + return [] + pool = pooler.get_pool(cr.dbname) + return pool.get('ir.model').search(cr, uid, [('model', 'in', models)]) + + def get_ids(self, cr, uid, object_list): + #This method return dictionary with ids of records of object for module + pool = pooler.get_pool(cr.dbname) + result_ids = {} + for obj in object_list: + ids = pool.get(obj).search(cr, uid, []) + ids = filter(lambda id: id != None, ids) + result_ids[obj] = ids + return result_ids + + def format_table(self, header=[], data_list={}): #This function can work forwidget="text_wiki" + detail = "" + detail += (header[0]) % tuple(header[1]) + frow = '\n|-' + for i in header[1]: + frow += '\n| %s' + for key, value in data_list.items(): + detail += (frow) % tuple(value) + detail = detail + '\n|}' + return detail + + def format_html_table(self, header=[], data_list=[]): #This function can work for widget="html_tag" + # function create html table.... + detail = "" + detail += (header[0]) % tuple(header[1]) + frow = '' + for i in header[1]: + frow += '%s' + frow += '' + for key, value in data_list.items(): + detail += (frow) % tuple(value) + return detail + + def add_quatation(self, x_no, y_no): + return x_no/y_no + +class module_quality_check(osv.osv): + _name = 'module.quality.check' + _columns = { + 'name': fields.char('Rated Module', size=64, ), + 'final_score': fields.char('Final Score (%)', size=10,), + 'check_detail_ids': fields.one2many('module.quality.detail', 'quality_check_id', 'Tests',) + } + + def check_quality(self, cr, uid, module_name, module_state=None): + ''' + This function will calculate score of openerp module + It will return data in below format: + Format: {'final_score':'80.50', 'name': 'sale', + 'check_detail_ids': + [(0,0,{'name':'workflow_test', 'score':'100', 'ponderation':'0', 'summary': text_wiki format data, 'detail': html format data, 'state':'done', 'note':'XXXX'}), + ((0,0,{'name':'terp_test', 'score':'60', 'ponderation':'1', 'summary': text_wiki format data, 'detail': html format data, 'state':'done', 'note':'terp desctioption'}), + ..........]} + So here the detail result is in html format and summary will be in text_wiki format. + ''' + #list_folders = os.listdir(config['addons_path']+'/base_module_quality/') + pool = pooler.get_pool(cr.dbname) + obj_module = pool.get('ir.module.module') + if not module_state: + module_id = obj_module.search(cr, uid, [('name', '=', module_name)]) + if module_id: + module_state = obj_module.browse(cr, uid, module_id[0]).state + + abstract_obj = abstract_quality_check() + score_sum = 0.0 + ponderation_sum = 0.0 + create_ids = [] + for test in abstract_obj.tests: + ad = tools.config['addons_path'] + if module_name == 'base': + ad = tools.config['root_path']+'/addons' + module_path = os.path.join(ad, module_name) + val = test.quality_test() + if not val.bool_installed_only or module_state == "installed": + val.run_test(cr, uid, str(module_path)) + if not val.error: + data = { + 'name': val.name, + 'score': val.score * 100, + 'ponderation': val.ponderation, + 'summary': val.result, + 'detail': val.result_details, + 'state': 'done', + 'note': val.note, + } + if val.bool_count_score: + score_sum += val.score * val.ponderation + ponderation_sum += val.ponderation + else: + data = { + 'name': val.name, + 'score': 0, + 'summary': val.result, + 'state': 'skipped', + 'note': val.note, + } + else: + data = { + 'name': val.name, + 'note': val.note, + 'score': 0, + 'state': 'skipped', + 'summary': _("The module has to be installed before running this test.") + } + create_ids.append((0, 0, data)) + + final_score = '%.2f' % (score_sum / ponderation_sum * 100) + data = { + 'name': module_name, + 'final_score': final_score, + 'check_detail_ids' : create_ids, + } + return data + +module_quality_check() + +class module_quality_detail(osv.osv): + _name = 'module.quality.detail' + _columns = { + 'quality_check_id': fields.many2one('module.quality.check', 'Quality'), + 'name': fields.char('Name',size=128,), + 'score': fields.float('Score (%)'), + 'ponderation': fields.float('Ponderation', help='Some tests are more critical than others, so they have a bigger weight in the computation of final rating'), + 'note': fields.text('Note',), + 'summary': fields.text('Summary'), + 'detail': fields.text('Details'), + 'state': fields.selection([('done','Done'),('skipped','Skipped'),], 'State', size=6, help='The test will be completed only if the module is installed or if the test may be processed on uninstalled module.'), + } + +module_quality_detail() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/base_module_quality/base_module_quality_view.xml b/addons/base_module_quality/base_module_quality_view.xml new file mode 100644 index 00000000000..18ad04415bd --- /dev/null +++ b/addons/base_module_quality/base_module_quality_view.xml @@ -0,0 +1,70 @@ + + + + + Results of Quality Checks + module.quality.check + tree + + + + + + + + + + Results of Quality Checks + module.quality.check + form + +
+ + + + + + + +
+ + Results of Quality Checks with detail + module.quality.detail + form + +
+ + + + + + + + + + + +