diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 02325bada84..e2b06ce9b78 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -58,6 +58,7 @@ + diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index f1a1050cf81..46d18515df4 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -676,7 +676,83 @@ class account_move_line(osv.osv): if update_check: if ('account_id' in vals) or ('journal_id' in vals) or ('period_id' in vals) or ('move_id' in vals) or ('debit' in vals) or ('credit' in vals) or ('date' in vals): self._update_check(cr, uid, ids, context) + + obj_line=self.browse(cr, uid, ids[0]) + lines={} + + obj_analytic_line=self.pool.get('account.analytic.line') + analytic=True + journal_flag=False + del_line=False + + if ('journal_id' in vals): + journal=self.pool.get('account.journal').browse(cr,uid,vals['journal_id']) + journal_flag=True + if not journal.analytic_journal_id: + del_line=True + + if ('analytic_account_id' in vals) and (not vals['analytic_account_id']): + del_line=True + + if del_line: + for obj in obj_line.analytic_lines: + obj_analytic_line.unlink(cr,uid,obj.id) + analytic=False + + if obj_line.analytic_lines: + mode='write' + else: + mode='create' + + if obj_line.analytic_lines and analytic: + if ('analytic_account_id' in vals): + lines['account_id'] = vals['analytic_account_id'] + + if ('account_id' in vals): + lines['general_account_id'] = vals['account_id'] + + if ('name' in vals): + lines['name'] = vals['name'] + + if ('date' in vals): + lines['date'] = vals['date'] + + if ('ref' in vals and vals['ref']): + lines['ref'] = vals['ref'] + + if ('quantity' in vals and vals['quantity']): + lines['unit_amount'] = vals['quantity'] + + if ('credit' in vals and vals['credit']): + lines['amount'] = vals['credit'] + + if ('debit' in vals and vals['debit']): + lines['amount'] = vals['debit'] + + if journal_flag: + lines['journal_id']=journal.analytic_journal_id.id + + if lines: + if mode=='write': + obj_analytic_line.write(cr,uid,obj_line.analytic_lines[0].id,lines,context) + result = super(osv.osv, self).write(cr, uid, ids, vals, context) + + if mode=='create' and analytic and obj_line.analytic_account_id: + if obj_line.journal_id.analytic_journal_id: + vals_lines={ + 'name': obj_line.name, + 'date': obj_line.date, + 'account_id': obj_line.analytic_account_id.id, + 'unit_amount':obj_line.quantity, + 'amount': obj_line.debit or obj_line.credit, + 'general_account_id': obj_line.account_id.id, + 'journal_id': obj_line.journal_id.analytic_journal_id.id, + 'ref': obj_line.ref, + 'move_id':obj_line.id + } + obj_analytic_line.create(cr,uid,vals_lines) + if check: done = [] for line in self.browse(cr, uid, ids): @@ -786,20 +862,20 @@ class account_move_line(osv.osv): if not ok: raise osv.except_osv(_('Bad account !'), _('You can not use this general account in this journal !')) - result = super(osv.osv, self).create(cr, uid, vals, context) +# result = super(osv.osv, self).create(cr, uid, vals, context) if 'analytic_account_id' in vals and vals['analytic_account_id']: if journal.analytic_journal_id: vals['analytic_lines'] = [(0,0, { 'name': vals['name'], 'date': vals['date'], 'account_id': vals['analytic_account_id'], - 'unit_amount': vals['quantity'], + 'unit_amount':'quantity' in vals and vals['quantity'] or 1.0, 'amount': vals['debit'] or vals['credit'], 'general_account_id': vals['account_id'], 'journal_id': journal.analytic_journal_id.id, 'ref': vals['ref'], })] - + result = super(osv.osv, self).create(cr, uid, vals, context) # CREATE Taxes if 'account_tax_id' in vals and vals['account_tax_id']: tax_id=tax_obj.browse(cr,uid,vals['account_tax_id']) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 2a16e205afe..f84f5181342 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -716,10 +716,10 @@ - + diff --git a/addons/account/i18n/fr_FR.po b/addons/account/i18n/fr_FR.po index 401f31fbff5..7b4ee9110f5 100644 --- a/addons/account/i18n/fr_FR.po +++ b/addons/account/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-11-02 20:23:25+0000\n" "PO-Revision-Date: 2008-11-02 20:23:25+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -853,7 +853,7 @@ msgstr "Propriétés des comptes" #. module: account #: model:ir.ui.menu,name:account.next_id_30 msgid "Bank Reconciliation" -msgstr "Reconciliation banquaire" +msgstr "Reconciliation bancaire" #. module: account #: model:ir.model,name:account.model_account_tax_template @@ -1097,7 +1097,7 @@ msgstr "Le champ sequence est utilisé pour classer les lignes de termes de paie #. module: account #: field:account.chart.template,property_account_income_categ:0 msgid "Income Category Account" -msgstr "" +msgstr "COmpte de type Revenu" #. module: account #: model:ir.actions.act_window,name:account.analytic_account_form @@ -1154,7 +1154,7 @@ msgstr "Journal" #. module: account #: view:res.partner:0 msgid "Bank account" -msgstr "Compte banquaire" +msgstr "Compte bancaire" #. module: account #: wizard_field:account.general.ledger.report,checktype,amount_currency:0 @@ -1322,7 +1322,7 @@ msgstr "Si vous déreconciliez des transactions, vous devez aussi vérifier tout #. module: account #: field:wizard.multi.charts.accounts,bank_accounts_id:0 msgid "Bank Accounts" -msgstr "Comptes Banquaires" +msgstr "Comptes Bancaires" #. module: account #: view:res.partner:0 @@ -2276,7 +2276,7 @@ msgstr "Certaines entrées sont déjà réconciliées !" #. module: account #: model:process.node,note:account.process_node_reconciliationofentries0 msgid "Reconcilation of the entries with invoice." -msgstr "" +msgstr "Réconciliation des entrées avec la facture." #. module: account #: view:account.tax:0 @@ -2310,7 +2310,7 @@ msgstr "Laissez vide pour utiliser la période de la date de validation" #, python-format #: code:addons/account/account.py:0 msgid "No period defined for this date !\nPlease create a fiscal year." -msgstr "" +msgstr "Pas de période définie pour cette date !\nVeuillez créer une année fiscale." #. module: account #: rml:account.central.journal:0 @@ -2344,7 +2344,7 @@ msgstr "Code" #. module: account #: model:process.process,name:account.process_process_invoiceworkflow0 msgid "Invoice Workflow" -msgstr "" +msgstr "Flux de la Facture" #. module: account #: view:account.bank.statement:0 @@ -2391,7 +2391,7 @@ msgstr "" #. module: account #: help:account.chart.template,tax_template_ids:0 msgid "List of all the taxes that have to be installed by the wizard" -msgstr "" +msgstr "Liste de toutes les taxes qui ont été installée par l'assistant" #. module: account #: rml:account.analytic.account.cost_ledger:0 @@ -2432,7 +2432,7 @@ msgstr "Mode Paysage" #. module: account #: model:process.transition,note:account.process_transition_analyticinvoice0 msgid "From analytic accounts, Create invoice." -msgstr "" +msgstr "Créer la facture à partir des comptes analytiques." #. module: account #: wizard_button:account.analytic.account.analytic.check.report,init,end:0 @@ -2484,6 +2484,8 @@ msgstr "Annuler" #: help:account.account.type,sign:0 msgid "Allows to change the displayed amount of the balance in the reports, in order to see positive results instead of negative ones in expenses accounts." msgstr "" +"Permettre de changer le montant affiché de la balance dans les rapports, dans " +"le but de voir les résultats positifs au lieu des négatifs dans les comptes de dépenses." #. module: account #: field:account.account.type,name:0 @@ -2592,12 +2594,12 @@ msgstr "Puissance" #, python-format #: code:addons/account/account_bank_statement.py:0 msgid "The account entries lines are not in valid state." -msgstr "" +msgstr "Les lignes d'entrées de compte ne sont pas dans un état valide." #. module: account #: view:res.partner:0 msgid "Bank account owner" -msgstr "Propriétaire du compte banquaire" +msgstr "Propriétaire du compte bancaire" #. module: account #: rml:account.invoice:0 @@ -2622,7 +2624,7 @@ msgstr "Plan de Comptes Analytiques" #: field:account.fiscal.position,account_ids:0 #: view:account.fiscal.position:0 msgid "Accounts Mapping" -msgstr "" +msgstr "Association des comptes" #. module: account #: field:account.invoice,number:0 @@ -2633,18 +2635,18 @@ msgstr "Numéro de facture" #: wizard_button:populate_statement_from_inv,customer,finish:0 #: wizard_button:populate_statement_from_inv,supplier,finish:0 msgid "O_k" -msgstr "" +msgstr "O_k" #. module: account #: model:process.node,note:account.process_node_reconciliation0 msgid "Reconciliation of entries from end of the payment " -msgstr "" +msgstr "Réconciliation des entrées de la fin du paiement " #. module: account #, python-format #: code:addons/account/wizard/wizard_fiscalyear_close.py:0 msgid "Closing of fiscal year canceled, please check the box !" -msgstr "" +msgstr "Cloture de l'année fiscale annulée, veuillez cocher la case !" #. module: account #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance @@ -2686,7 +2688,7 @@ msgstr "Transactions de reconciliation" #. module: account #: wizard_field:account.aged.trial.balance,init,direction_selection:0 msgid "Analysis Direction" -msgstr "" +msgstr "Direction de l'analyse" #. module: account #: field:res.partner,ref_companies:0 @@ -2744,23 +2746,29 @@ msgstr "État Ouvert" #. module: account #: rml:account.analytic.account.quantity_cost_ledger:0 msgid "Max.qty:" -msgstr "" +msgstr "Qté Max." #. module: account #: help:account.account,currency_mode:0 msgid "This will select how is computed the current currency rate for outgoing transactions. In most countries the legal method is \"average\" but only a few softwares are able to manage this. So if you import from another software, you may have to use the rate at date. Incoming transactions, always use the rate at date." msgstr "" +"Cela sélectionnera la façon dont sera calculé le taux de change pour les " +"transactions sortantes. Dans la plupart des pays, la méthode légale est la " +"méthode \"moyenne\" mais seuls, un certain nombre de logiciels sont capables " +"de la gérer. Ainsi, si vous importez à partir d'un autre logiciel, vous devrez " +"probablement utiliser le taux à la date. Pour les transactions entrantes, utilisez " +"toujours le taux à la date." #. module: account #: model:process.transition,note:account.process_transition_statemententries0 msgid "From statement, create entries" -msgstr "" +msgstr "Créer les entrées à partir des extraits" #. module: account #, python-format #: code:addons/account/account.py:0 msgid "You can not delete posted movement: \"%s\"!" -msgstr "" +msgstr "Vous ne pouvez pas effacer le pouvement posté : \"%s\"!" #. module: account #: rml:account.partner.balance:0 @@ -2779,7 +2787,7 @@ msgstr "" #: rml:account.vat.declaration:0 #: rml:account.analytic.account.journal:0 msgid "1cm 27.7cm 20cm 27.7cm" -msgstr "" +msgstr "1cm 27.7cm 20cm 27.7cm" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree12 @@ -2790,12 +2798,12 @@ msgstr "Notes de Crédit Fournisseur Brouillon" #. module: account #: model:process.process,note:account.process_process_invoiceworkflow0 msgid "Invoice flow for services companies." -msgstr "" +msgstr "Flux des factures pour les sociétés de services." #. module: account #: model:process.node,name:account.process_node_accountingstatemententries0 msgid "Accounting Statement" -msgstr "" +msgstr "Extraits de compte" #. module: account #: rml:account.invoice:0 @@ -2807,7 +2815,7 @@ msgstr "Note de Crédit Fournisseur" #, python-format #: code:addons/account/account_bank_statement.py:0 msgid "Unable to reconcile entry \"%s\": %.2f" -msgstr "" +msgstr "Impossible de réconcilier l'entrée \"%s\": %.2f" #. module: account #: field:account.bank.statement,balance_end_real:0 @@ -2833,7 +2841,7 @@ msgstr "Lignes d'entrée" #. module: account #: field:account.account,check_history:0 msgid "Display History" -msgstr "" +msgstr "Afficher l'historique" #. module: account #: field:account.move.line,centralisation:0 @@ -2851,7 +2859,7 @@ msgstr "Code de taxe" #. module: account #: rml:account.analytic.account.journal:0 msgid "Analytic Journal -" -msgstr "" +msgstr "Journal Analytique -" #. module: account #, python-format @@ -2862,12 +2870,12 @@ msgstr "" #. module: account #: rml:account.analytic.account.analytic.check:0 msgid "Analytic Debit" -msgstr "" +msgstr "Débit Analytique" #. module: account #: field:account.account,currency_mode:0 msgid "Outgoing Currencies Rate" -msgstr "" +msgstr "Taux de Change Sortant" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree10 @@ -2879,7 +2887,7 @@ msgstr "Note de Crédit Client Brouillon" #, python-format #: code:addons/account/account.py:0 msgid "Sales Journal" -msgstr "" +msgstr "Journal des Ventes" #. module: account #: field:account.journal.column,readonly:0 @@ -2911,7 +2919,7 @@ msgstr "Le mouvement de cette ligne d'entrée." #. module: account #: field:account.invoice.line,uos_id:0 msgid "Unit of Measure" -msgstr "" +msgstr "Unité de Mesure" #. module: account #: view:account.tax.template:0 @@ -2922,7 +2930,7 @@ msgstr "Laisser vide pour utiliser le compte de revenu" #. module: account #: rml:account.central.journal:0 msgid "Printing Date" -msgstr "" +msgstr "Date d'Impression" #. module: account #: constraint:account.analytic.account:0 @@ -2955,12 +2963,12 @@ msgstr "Ouvrir pour réconciliation" #. module: account #: rml:account.general.ledger:0 msgid "Entry Label" -msgstr "" +msgstr "Titre de l'Entrée" #. module: account #: model:process.transition,note:account.process_transition_paymentreconcile0 msgid "Reconcilate the entries from payment" -msgstr "" +msgstr "Réconcilier les entrées à partir du paiement" #. module: account #: rml:account.tax.code.entries:0 @@ -2971,7 +2979,7 @@ msgstr "(" #, python-format #: code:addons/account/account.py:0 msgid "You can not modify/delete a journal with entries for this period !" -msgstr "" +msgstr "Vous ne pouvez pas modifier/effacer un journal avec des entrées pour cette période !" #. module: account #: view:account.invoice:0 @@ -2983,13 +2991,13 @@ msgstr "Mettre en brouillon" #. module: account #: help:account.invoice,origin:0 msgid "Reference of the document that produced this invoice." -msgstr "" +msgstr "Référence du document qui a produit cette facture." #. module: account #: selection:account.account.template,type:0 #: selection:account.account,type:0 msgid "Payable" -msgstr "" +msgstr "Payable" #. module: account #: rml:account.invoice:0 @@ -3006,12 +3014,12 @@ msgstr "Intitulé des comptes" #: selection:account.account.template,type:0 #: selection:account.account,type:0 msgid "Others" -msgstr "" +msgstr "Autres" #. module: account #: field:account.chart.template,property_account_expense_categ:0 msgid "Expense Category Account" -msgstr "" +msgstr "Compte de type Dépense" #. module: account #: wizard_button:account.move.validate,init,validate:0 @@ -3029,7 +3037,7 @@ msgstr "Légende" #. module: account #: model:process.node,note:account.process_node_draftinvoices0 msgid "Proposed invoice to be checked, validated and printed" -msgstr "" +msgstr "Facture proposée pour être vérifiée, validée ou imprimée" #. module: account #: model:ir.actions.act_window,name:account.action_move_line_select @@ -3067,7 +3075,8 @@ msgstr "Notes" #. module: account #: help:account.invoice,reconciled:0 msgid "The account moves of the invoice have been reconciled with account moves of the payment(s)." -msgstr "" +msgstr "Les mouvements de compte de la facture ont été réconciliés avec les " +"mouvements de compte du(des) paiement(s)." #. module: account #: model:ir.actions.act_window,name:account.action_tax_form @@ -3093,12 +3102,12 @@ msgstr "" #. module: account #: selection:account.account,currency_mode:0 msgid "Average Rate" -msgstr "" +msgstr "Taux Moyen" #. module: account #: model:process.node,note:account.process_node_bankstatement0 msgid "Statement encoding produces payment entries" -msgstr "" +msgstr "L'encodage des extraits produits les entrées du paiement" #. module: account #: model:ir.model,name:account.model_account_bank_statement_reconcile_line @@ -3115,7 +3124,7 @@ msgstr "Modèles pour les Comptes" #: code:addons/account/account_move_line.py:0 #: code:addons/account/account_analytic_line.py:0 msgid "Entries: " -msgstr "" +msgstr "Entrées : " #. module: account #: model:ir.actions.wizard,name:account.wizard_reconcile @@ -3147,12 +3156,12 @@ msgstr "Nom de la taxe" #. module: account #: model:ir.actions.report.xml,name:account.account_overdue msgid "Overdue Payments" -msgstr "" +msgstr "Paiements en retard" #. module: account #: model:account.payment.term,name:account.account_payment_term msgid "30 Days End of Month" -msgstr "" +msgstr "30 Jours Fin de Mois" #. module: account #: view:account.account:0 @@ -3167,7 +3176,7 @@ msgstr "N° d'écriture" #. module: account #: field:account.fiscal.position.tax,tax_src_id:0 msgid "Tax Source" -msgstr "" +msgstr "Source de la Taxe" #. module: account #: model:ir.actions.report.xml,name:account.account_analytic_account_balance @@ -3184,23 +3193,23 @@ msgstr "Total débit" #, python-format #: code:addons/account/wizard/wizard_bank_reconcile.py:0 msgid "You have to define the bank account\nin the journal definition for reconciliation." -msgstr "" +msgstr "Vous devez définir le compte bancaire\ndans la définition du journal pour la réconciliation." #. module: account #: view:wizard.multi.charts.accounts:0 msgid "Bank Information" -msgstr "" +msgstr "Information Bancaire" #. module: account #, python-format #: code:addons/account/account_move_line.py:0 msgid "Entry \"%s\" is not valid !" -msgstr "" +msgstr "L'entrée \"%s\" n'est pas valide !" #. module: account #: rml:account.invoice:0 msgid "Fax :" -msgstr "" +msgstr "Fax :" #. module: account #: rml:account.partner.balance:0 @@ -3208,7 +3217,7 @@ msgstr "" #: model:ir.actions.wizard,name:account.wizard_partner_balance_report #: model:ir.ui.menu,name:account.menu_partner_balance msgid "Partner Balance" -msgstr "" +msgstr "Balance Partenaire" #. module: account #: rml:account.third_party_ledger:0 @@ -3249,7 +3258,7 @@ msgstr "Entrées réelles" #. module: account #: model:process.node,name:account.process_node_importinvoice0 msgid "Import invoice" -msgstr "" +msgstr "Importer la facture" #. module: account #: view:account.invoice:0 @@ -3307,7 +3316,7 @@ msgstr "Type de compte" #. module: account #: wizard_view:account.analytic.line,init:0 msgid "Account Analytic Lines Analysis" -msgstr "" +msgstr "Analyse des Lignes de Compte Analytique" #. module: account #: wizard_view:account.account.balance.report,checktype:0 @@ -3315,7 +3324,7 @@ msgstr "" #: wizard_view:account.partner.balance.report,init:0 #: wizard_view:account.third_party_ledger.report,init:0 msgid "Filter on Periods" -msgstr "" +msgstr "Filtrer sur les Périodes" #. module: account #: field:res.partner,property_account_receivable:0 @@ -3330,7 +3339,7 @@ msgstr "Payer et réconcilier" #. module: account #: model:ir.actions.report.xml,name:account.account_central_journal msgid "Central Journal" -msgstr "" +msgstr "Journal Central" #. module: account #, python-format @@ -3340,7 +3349,7 @@ msgstr "" #: code:addons/account/account_analytic_line.py:0 #: code:addons/account/wizard/wizard_pay_invoice.py:0 msgid "Error !" -msgstr "" +msgstr "Erreur !" #. module: account #: rml:account.third_party_ledger:0 @@ -3361,7 +3370,7 @@ msgstr "Enfants consolidés" #. module: account #: model:ir.actions.report.xml,name:account.account_vat_declaration msgid "Taxes Report" -msgstr "" +msgstr "Rapports de Taxes" #. module: account #: selection:account.journal.period,state:0 @@ -3398,7 +3407,7 @@ msgstr "Journal" #: selection:account.account.template,type:0 #: selection:account.account,type:0 msgid "Closed" -msgstr "" +msgstr "Fermé" #. module: account #: view:account.analytic.line:0 @@ -3429,7 +3438,7 @@ msgstr "Référence Client:" #. module: account #: field:wizard.multi.charts.accounts,code_digits:0 msgid "# of Digits" -msgstr "" +msgstr "# de décimales" #. module: account #: wizard_field:account.move.line.reconcile,addendum,period_id:0 @@ -3439,7 +3448,7 @@ msgstr "Période d'ajustement" #. module: account #: help:account.invoice,account_id:0 msgid "The partner account used for this invoice." -msgstr "" +msgstr "Le compte partenaire utilisé pour cette facture." #. module: account #: model:process.transition,note:account.process_transition_accountentryreconcile0 @@ -3456,12 +3465,12 @@ msgstr "Encoder entrée" #: wizard_button:account.invoice.refund,init,refund:0 #: model:ir.actions.wizard,name:account.wizard_invoice_refund msgid "Credit Note" -msgstr "" +msgstr "Note de Crédit" #. module: account #: selection:account.config.wizard,period:0 msgid "3 Months" -msgstr "" +msgstr "3 Mois" #. module: account #: wizard_view:account.move.journal,init:0 @@ -3471,12 +3480,13 @@ msgstr "Entrées standard" #. module: account #: help:account.account,check_history:0 msgid "Check this box if you want to print all entries when printing the General Ledger, otherwise it will only print its balance." -msgstr "" +msgstr "Cochez cette case si vous voulez imprimer les entrées lors de l'impression " +"du Grand Livre des Comptes Généraux, sinon, elle imprimera uniquement la balance." #. module: account #: model:process.node,note:account.process_node_draftstatement0 msgid "Set starting and ending balance if bank statement" -msgstr "" +msgstr "Définissez la balance de départ et de fin si extrait bancaire" #. module: account #: selection:account.config.wizard,period:0 @@ -3504,7 +3514,7 @@ msgstr "Écriture d'abonnement" #. module: account #: model:ir.actions.act_window,name:account.action_account_config_wizard_form msgid "Account Configure Wizard " -msgstr "" +msgstr "Assistant de Configuration des Comptes" #. module: account #: wizard_button:account.wizard_paid_open,init,yes:0 @@ -3514,7 +3524,7 @@ msgstr "Oui" #. module: account #: wizard_view:account.general.ledger.report,account_selection:0 msgid "Select Chart" -msgstr "" +msgstr "Sélectionnez le Graphique" #. module: account #: model:ir.actions.report.xml,name:account.account_move_line_list @@ -3530,14 +3540,14 @@ msgstr "Note de Crédit Fournisseur" #. module: account #: rml:account.invoice:0 msgid "Invoice Date" -msgstr "" +msgstr "Date d'Impression" #. module: account #, python-format #: code:addons/account/wizard/wizard_open_closed_fiscalyear.py:0 #: code:addons/account/wizard/wizard_fiscalyear_close.py:0 msgid "The journal must have centralised counterpart" -msgstr "" +msgstr "Le journal doit avoir une contre-partie centralisée" #. module: account #: selection:account.account.type,close_method:0 @@ -3553,7 +3563,7 @@ msgstr "Ouvrir pour déréconciliation" #, python-format #: code:addons/account/invoice.py:0 msgid "Bad total !" -msgstr "" +msgstr "Total incorrect !" #. module: account #: field:account.journal,sequence_id:0 @@ -3570,7 +3580,7 @@ msgstr "Traitement les différences de paiement" #. module: account #: model:process.node,name:account.process_node_paymententries0 msgid "Payment Entries" -msgstr "" +msgstr "Entrées du Paiement" #. module: account #: model:ir.model,name:account.model_account_payment_term_line @@ -3598,13 +3608,15 @@ msgstr "En suspend" #. module: account #: rml:account.general.journal:0 msgid "General Journal -" -msgstr "" +msgstr "Journal Général -" #. module: account #, python-format #: code:addons/account/account_move_line.py:0 msgid "You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields !" msgstr "" +"Vous ne pouvez pas effetcuer cette modification sur une entrée confirmée ! Veuillez " +"noter que vous pouvez quand même changer certains champs non importants !" #. module: account #: rml:account.overdue:0 @@ -3619,7 +3631,7 @@ msgstr "" #. module: account #: rml:account.overdue:0 msgid "Customer account statement" -msgstr "" +msgstr "Extrait de Compte Client" #. module: account #: model:ir.actions.act_window,name:account.action_account_journal_form @@ -3655,7 +3667,7 @@ msgstr "Groupes" #. module: account #: rml:account.analytic.account.quantity_cost_ledger:0 msgid "Code/Date" -msgstr "" +msgstr "Code/Date" #. module: account #: field:account.account,active:0 @@ -3671,7 +3683,7 @@ msgstr "Actif" #. module: account #: model:process.node,note:account.process_node_electronicfile0 msgid "Import from your bank statements" -msgstr "" +msgstr "Importer de vos extraits bancaires" #. module: account #: field:account.invoice.line,discount:0 @@ -3681,7 +3693,7 @@ msgstr "Escompte (%)" #. module: account #: view:account.chart.template:0 msgid "Properties" -msgstr "" +msgstr "Propriétés" #. module: account #: view:account.account:0 @@ -3695,12 +3707,12 @@ msgstr "Informations générales" #. module: account #: rml:account.general.journal:0 msgid "Printing Date :" -msgstr "" +msgstr "Date d'Impression :" #. module: account #: model:process.process,name:account.process_process_statementworkflow0 msgid "Statement workflow" -msgstr "" +msgstr "Flux de l'Extrait" #. module: account #: rml:account.analytic.account.quantity_cost_ledger:0 @@ -3708,17 +3720,17 @@ msgstr "" #: rml:account.general.journal:0 #: rml:account.invoice:0 msgid "Total:" -msgstr "" +msgstr "Total :" #. module: account #: wizard_field:account.vat.declaration,init,based_on:0 msgid "Base on" -msgstr "" +msgstr "Basé sur" #. module: account #: field:account.chart.template,property_account_payable:0 msgid "Payable Account" -msgstr "" +msgstr "Compte Payable" #. module: account #: field:account.account,currency_id:0 @@ -3811,7 +3823,7 @@ msgstr "Limite de paiement" #, python-format #: code:addons/account/invoice.py:0 msgid "Global taxes defined, but not in invoice lines !" -msgstr "" +msgstr "Taxes globales définies, mais pas dans les lignes de facture !" #. module: account #: wizard_field:account.account.balance.report,checktype,state:0 @@ -3819,7 +3831,7 @@ msgstr "" #: wizard_field:account.partner.balance.report,init,state:0 #: wizard_field:account.third_party_ledger.report,init,state:0 msgid "Date/Period Filter" -msgstr "" +msgstr "Filtre par Date/Période" #. module: account #: rml:account.analytic.account.journal:0 @@ -3832,7 +3844,7 @@ msgstr "Général" #. module: account #: rml:account.general.journal:0 msgid "Credit Trans." -msgstr "" +msgstr "Trans. de Crédit" #. module: account #: help:account.bank.statement.reconcile,total_second_currency:0 @@ -3910,7 +3922,7 @@ msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactè #. module: account #: help:account.config.wizard,code:0 msgid "Name of the fiscal year as displayed in reports." -msgstr "" +msgstr "Nom de l'année fiscale comme affichée sur les rapports." #. module: account #: help:account.move.line,date_maturity:0 @@ -3935,7 +3947,7 @@ msgstr "Types de contrôle" #. module: account #: wizard_view:populate_statement_from_inv,init:0 msgid "Choose invoice type and payment date" -msgstr "" +msgstr "Choisissez le type de facture et la date de paiement" #. module: account #: rml:account.analytic.account.analytic.check:0 @@ -3950,7 +3962,7 @@ msgstr "Nom du compte" #: wizard_field:account.move.line.reconcile,init_partial,credit:0 #: wizard_field:account.move.line.reconcile,init_full,credit:0 msgid "Credit amount" -msgstr "" +msgstr "Montant du Crédit" #. module: account #: rml:account.invoice:0 @@ -3977,7 +3989,7 @@ msgstr "Produit" #. module: account #: rml:account.partner.balance:0 msgid "Partner name" -msgstr "" +msgstr "Nom du Partenaire" #. module: account #: rml:account.tax.code.entries:0 @@ -4018,13 +4030,13 @@ msgstr "Colonnes" #. module: account #: model:process.transition,note:account.process_transition_filestatement0 msgid "Import file from your bank statement" -msgstr "" +msgstr "Importer un fichier de vos extraits bancaire" #. module: account #: field:account.account.template,type:0 #: field:account.account,type:0 msgid "Internal Type" -msgstr "" +msgstr "Type Interne" #. module: account #: model:ir.actions.act_window,name:account.action_subscription_form_running @@ -4805,7 +4817,7 @@ msgstr "Cochez ce compte si l'utilisateur peut faire une réconciliation des ent #. module: account #: view:res.partner:0 msgid "Supplier Debit" -msgstr "" +msgstr "Débit du Fournisseur" #. module: account #: wizard_button:account.invoice.pay,init,writeoff_check:0 @@ -4815,7 +4827,7 @@ msgstr "Paiement total" #. module: account #: rml:account.analytic.account.analytic.check:0 msgid "Analytic Credit" -msgstr "" +msgstr "Crédit Analytique" #. module: account #: field:account.fiscal.position.tax,tax_dest_id:0 @@ -4831,7 +4843,7 @@ msgstr "" #, python-format #: code:addons/account/wizard/wizard_journal.py:0 msgid "This period is already closed !" -msgstr "" +msgstr "Cette période est déjà close !" #. module: account #: wizard_view:account_use_models,create:0 @@ -4865,7 +4877,7 @@ msgstr "Toutes les entrées de compte" #: wizard_view:account.partner.balance.report,init:0 #: wizard_view:account.third_party_ledger.report,init:0 msgid "Date Filter" -msgstr "" +msgstr "Filtre par Date" #. module: account #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile @@ -4882,7 +4894,7 @@ msgstr "Notes de Crédit Client Non Payées" #. module: account #: help:account.invoice,residual:0 msgid "Remaining amount due." -msgstr "" +msgstr "Montant dû restant." #. module: account #: wizard_view:account.fiscalyear.close,init:0 @@ -4904,7 +4916,7 @@ msgstr "Lignes d'Entrée Partielle" #. module: account #: help:account.move.line,statement_id:0 msgid "The bank statement used for bank reconciliation" -msgstr "Le relevé banquaire utilisé pour la réconciliation banquaire" +msgstr "Le relevé bancaire utilisé pour la réconciliation bancaire" #. module: account #: view:account.fiscalyear:0 @@ -4914,13 +4926,13 @@ msgstr "Exercice" #. module: account #: wizard_button:account.analytic.line,init,open:0 msgid "Open Entries" -msgstr "" +msgstr "Entrées Ouvertes" #. module: account #, python-format #: code:addons/account/account_move_line.py:0 msgid "Bad account!" -msgstr "" +msgstr "Compte incorrect !" #. module: account #: selection:account.analytic.account,type:0 @@ -4951,7 +4963,7 @@ msgstr "Utilisateur" #, python-format #: code:addons/account/account_move_line.py:0 msgid "You can not use an inactive account!" -msgstr "" +msgstr "Vous ne pouvez pas utiliser un compte inactif !" #. module: account #: wizard_field:account.general.ledger.report,checktype,soldeinit:0 @@ -4962,7 +4974,7 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_generic_report msgid "Generic Reports" -msgstr "" +msgstr "Rapports Génériques" #. module: account #: rml:account.account.balance:0 @@ -4979,7 +4991,7 @@ msgstr "Montant réconcilié" #. module: account #: selection:account.account,currency_mode:0 msgid "At Date" -msgstr "" +msgstr "À la Date" #. module: account #: rml:account.central.journal:0 @@ -5002,7 +5014,7 @@ msgstr "Calculer" #. module: account #: help:account.invoice.line,account_id:0 msgid "The income or expense account related to the selected product." -msgstr "" +msgstr "Le compte de revenu ou de dépense relatif au produit sélectionné." #. module: account #: field:account.bank.statement.reconcile,total_entry:0 @@ -5018,7 +5030,7 @@ msgstr "Montant total" #. module: account #: field:account.invoice,amount_untaxed:0 msgid "Untaxed" -msgstr "" +msgstr "Non Taxé" #. module: account #: model:ir.model,name:account.model_report_hr_timesheet_invoice_journal @@ -5029,7 +5041,7 @@ msgstr "Compte analytique coûts et revenus" #, python-format #: code:addons/account/account_move_line.py:0 msgid "Bad account !" -msgstr "" +msgstr "Compte Incorrect !" #. module: account #, python-format @@ -5037,7 +5049,7 @@ msgstr "" #: code:addons/account/account_move_line.py:0 #: code:addons/account/wizard/wizard_open_closed_fiscalyear.py:0 msgid "Error" -msgstr "" +msgstr "Erreur" #. module: account #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0 @@ -5065,18 +5077,18 @@ msgstr "" #: wizard_button:account.account.balance.report,account_selection,checktype:0 #: wizard_button:account.general.ledger.report,account_selection,checktype:0 msgid "Next" -msgstr "" +msgstr "Suivant" #. module: account #, python-format #: code:addons/account/invoice.py:0 msgid "Taxes missing !" -msgstr "" +msgstr "Taxes Manquantes !" #. module: account #: help:account.invoice,partner_bank:0 msgid "The bank account to pay to or to be paid from" -msgstr "Compte banquaire à débiter ou à créditer" +msgstr "Compte bancaire à débiter ou à créditer" #. module: account #: rml:account.invoice:0 @@ -5098,7 +5110,7 @@ msgstr "" #. module: account #: model:process.process,note:account.process_process_statementworkflow0 msgid "Statement flow for services companies." -msgstr "" +msgstr "Flux des factures pour les sociétés de services." #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form @@ -5136,13 +5148,13 @@ msgstr "Laisser vide pour utiliser le compte de dépense" #. module: account #: help:res.partner,debit:0 msgid "Total amount you have to pay to this supplier." -msgstr "" +msgstr "Montant total que vous devez payé pour ce fournisseur." #. module: account #, python-format #: code:addons/account/account.py:0 msgid "No sequence defined in the journal !" -msgstr "" +msgstr "Pas de séquence définie dans ce journal !" #. module: account #: selection:account.analytic.account,state:0 @@ -5169,7 +5181,7 @@ msgstr "Liste des Comptes" #: view:product.product:0 #: view:product.template:0 msgid "Sales Properties" -msgstr "" +msgstr "Propriétés des Ventes" #. module: account #: view:res.partner:0 @@ -5195,17 +5207,17 @@ msgstr "Montant total dû :" #. module: account #: wizard_field:account.analytic.line,init,to_date:0 msgid "To" -msgstr "" +msgstr "Au" #. module: account #: view:account.analytic.account:0 msgid "Analytic Account Statistics" -msgstr "" +msgstr "Statistiques des Comptes Analytiques" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form msgid "Entries of Open Analytic Journals" -msgstr "" +msgstr "Entrées des Journaux Analytiques Ouverts" #. module: account #: view:account.invoice.tax:0 @@ -5239,13 +5251,13 @@ msgstr "Nom du modèle" #, python-format #: code:addons/account/invoice.py:0 msgid "Cannot delete invoice(s) which are already opened or paid !" -msgstr "" +msgstr "Impossible de supprimer une(des) facture(s) déjà ouverte(s) ou payée(s) !" #. module: account #, python-format #: code:addons/account/invoice.py:0 msgid "Can not create invoice move on centralized journal" -msgstr "" +msgstr "Impossible de créer une facture sur un journal centralisé" #. module: account #: help:res.partner,property_account_receivable:0 @@ -5255,7 +5267,7 @@ msgstr "Ce compte sera utilisé, au lieu de celui par defaut, en tant que compte #. module: account #: wizard_button:account.vat.declaration,init,report:0 msgid "Print VAT Decl." -msgstr "" +msgstr "Imprimer la Déclaration TVA" #. module: account #: rml:account.invoice:0 @@ -5301,12 +5313,12 @@ msgstr "Modèles de Plan de Comptes" #. module: account #: view:account.config.wizard:0 msgid "Account Configure" -msgstr "" +msgstr "Configurer le Compte" #. module: account #: model:process.transition,note:account.process_transition_validentries0 msgid "Valid entries from invoice" -msgstr "" +msgstr "Entrées valides de la facture" #. module: account #: selection:account.subscription,state:0 @@ -5352,11 +5364,14 @@ msgstr "Référence" #: code:addons/account/invoice.py:0 msgid "Can not create an automatic sequence for this piece !\n\nPut a sequence in the journal definition for automatic numbering or create a sequence manually for this piece." msgstr "" +"Impossible de créer une séquence automatique pour cette pièce !\n\nDéfinissez une " +"séquence dans la définition du journal pour une numérotation automatique ou " +"créez une séquence manuellement pour cette pièce." #. module: account #: rml:account.analytic.account.balance:0 msgid "Analytic Balance -" -msgstr "" +msgstr "Balance Analytique -" #. module: account #: wizard_field:account_use_models,init_form,model:0 @@ -5378,7 +5393,7 @@ msgstr "Client" #, python-format #: code:addons/account/wizard/wizard_pay_invoice.py:0 msgid "Can not pay draft invoice." -msgstr "" +msgstr "Impossible de payer une facture brouillon." #. module: account #: field:account.subscription,period_type:0 @@ -5393,7 +5408,7 @@ msgstr "Obligatoire" #. module: account #: wizard_field:account.print.journal.report,init,sort_selection:0 msgid "Entries Sorted By" -msgstr "" +msgstr "Entrées Triées Par" #. module: account #: help:account.tax,name:0 @@ -5403,7 +5418,7 @@ msgstr "Ce nom sera utilisé pour être affiché sur les rapports" #. module: account #: rml:account.journal.period.print:0 msgid "Print Journal -" -msgstr "" +msgstr "Imprimer le Journal -" #. module: account #: help:account.account,currency_id:0 @@ -5416,7 +5431,7 @@ msgstr "Force tout les mouvements pour ce compte à avoir cette devise secondair #: wizard_view:account.partner.balance.report,init:0 #: wizard_view:account.third_party_ledger.report,init:0 msgid "Select Date-Period" -msgstr "" +msgstr "Sélectionnez la Date-Période" #. module: account #: model:account.account.type,name:account.account_type_cash_moves @@ -5428,7 +5443,7 @@ msgstr "Liquidités" #. module: account #: field:account.fiscal.position.account,account_dest_id:0 msgid "Account Destination" -msgstr "" +msgstr "Destination du Compte" #. module: account #: rml:account.overdue:0 @@ -5446,7 +5461,7 @@ msgstr "Exercice comptable" #: field:account.invoice,payment_ids:0 #: view:account.invoice:0 msgid "Payments" -msgstr "" +msgstr "Paiements" #. module: account #: view:product.product:0 @@ -5458,7 +5473,7 @@ msgstr "Comptabilité" #. module: account #: model:process.transition,note:account.process_transition_entriesreconcile0 msgid "Reconcile Entries." -msgstr "" +msgstr "Réconcilier les Entrées." #. module: account #: field:account.subscription.line,move_id:0 @@ -5469,7 +5484,7 @@ msgstr "Entrée" #: model:process.node,note:account.process_node_paidinvoice0 #: model:process.transition,note:account.process_transition_reconcilepaid0 msgid "Paid invoice when reconciled." -msgstr "" +msgstr "Facture payée après réconciliation." #. module: account #: field:account.tax,python_compute_inv:0 @@ -5494,7 +5509,7 @@ msgstr "Code Python (TVA Incl)" #: rml:account.vat.declaration:0 #: rml:account.analytic.account.journal:0 msgid "Page" -msgstr "" +msgstr "Page" #. module: account #: model:ir.actions.act_window,name:account.action_payment_term_form @@ -5508,7 +5523,7 @@ msgstr "Conditions de Paiement" #: help:account.tax.template,ref_tax_sign:0 #: help:account.tax.template,tax_sign:0 msgid "Usually 1 or -1." -msgstr "" +msgstr "Souvent 1 ou -1." #. module: account #: model:ir.model,name:account.model_account_move @@ -5534,7 +5549,7 @@ msgstr "Lignes analytiques" #. module: account #: field:account.bank.accounts.wizard,acc_no:0 msgid "Account No." -msgstr "" +msgstr "Compte N°." #. module: account #: model:ir.actions.wizard,name:account.wizard_invoice_state_cancel @@ -5544,7 +5559,7 @@ msgstr "Annuler les factures sélectionnées" #. module: account #: help:account.config.wizard,name:0 msgid "Name of the fiscal year as displayed on screens." -msgstr "" +msgstr "Nom de l'année fiscale comme affiché sur les écrans." #. module: account #: model:ir.model,name:account.model_account_payment_term @@ -5566,7 +5581,7 @@ msgstr "Devise" #. module: account #: model:process.node,name:account.process_node_confirmedstatement0 msgid "Confirmed statement" -msgstr "" +msgstr "Extrait confirmé" #. module: account #: model:ir.model,name:account.model_account_bank_statement_reconcile @@ -5590,5 +5605,5 @@ msgstr "Nom de colonne" #: wizard_view:account.partner.balance.report,init:0 #: wizard_view:account.third_party_ledger.report,init:0 msgid "Filters" -msgstr "" +msgstr "Filtres" diff --git a/addons/account/invoice.py b/addons/account/invoice.py index d346a5824fe..747b5d4a629 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -861,6 +861,7 @@ class account_invoice_line(osv.osv): _description = "Invoice line" _columns = { 'name': fields.char('Description', size=256, required=True), + 'origin': fields.char('Origin', size=256, help="Reference of the document that produced this invoice."), 'invoice_id': fields.many2one('account.invoice', 'Invoice Ref', ondelete='cascade', select=True), 'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null'), 'product_id': fields.many2one('product.product', 'Product', ondelete='set null'), diff --git a/addons/account_analytic_analysis/i18n/fr_FR.po b/addons/account_analytic_analysis/i18n/fr_FR.po index da70d21a06f..a8248f20c93 100644 --- a/addons/account_analytic_analysis/i18n/fr_FR.po +++ b/addons/account_analytic_analysis/i18n/fr_FR.po @@ -1,4 +1,4 @@ -# Translation of OpenERP Server. +# Translation of OpenERP Server. # This file containt the translation of the following modules: # * account_analytic_analysis # @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:28+0000\n" "PO-Revision-Date: 2008-10-09 12:57+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -18,11 +18,9 @@ msgstr "" #. module: account_analytic_analysis #: constraint:ir.model:0 -msgid "" -"The Object name must start with x_ and not contain any special character !" +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 !" +"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !" #. module: account_analytic_analysis #: field:account.analytic.account,remaining_ca:0 diff --git a/addons/account_analytic_default/i18n/fr_FR.po b/addons/account_analytic_default/i18n/fr_FR.po index a9fb37026f9..a677386f523 100644 --- a/addons/account_analytic_default/i18n/fr_FR.po +++ b/addons/account_analytic_default/i18n/fr_FR.po @@ -1,4 +1,4 @@ -# Translation of OpenERP Server. +# Translation of OpenERP Server. # This file containt the translation of the following modules: # * account_analytic_default # @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:25+0000\n" "PO-Revision-Date: 2008-10-09 13:01+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/account_analytic_plans/i18n/fr_FR.po b/addons/account_analytic_plans/i18n/fr_FR.po index 6ed5db7c154..6047e642300 100644 --- a/addons/account_analytic_plans/i18n/fr_FR.po +++ b/addons/account_analytic_plans/i18n/fr_FR.po @@ -1,4 +1,4 @@ -# Translation of OpenERP Server. +# Translation of OpenERP Server. # This file containt the translation of the following modules: # * account_analytic_plans # @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:29+0000\n" "PO-Revision-Date: 2008-10-09 13:24+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/account_balance/i18n/fr_FR.po b/addons/account_balance/i18n/fr_FR.po index b6b4d943338..1ef97b75758 100644 --- a/addons/account_balance/i18n/fr_FR.po +++ b/addons/account_balance/i18n/fr_FR.po @@ -1,4 +1,4 @@ -# Translation of OpenERP Server. +# Translation of OpenERP Server. # This file containt the translation of the following modules: # * account_balance # @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:29+0000\n" "PO-Revision-Date: 2008-10-09 14:13+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/account_budget/i18n/fr_FR.po b/addons/account_budget/i18n/fr_FR.po index f1c7b9cf177..21d025dc1f9 100644 --- a/addons/account_budget/i18n/fr_FR.po +++ b/addons/account_budget/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:26+0000\n" "PO-Revision-Date: 2008-10-14 10:30+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/account_date_check/i18n/fr_FR.po b/addons/account_date_check/i18n/fr_FR.po index d55843623d4..ed2bfba3942 100644 --- a/addons/account_date_check/i18n/fr_FR.po +++ b/addons/account_date_check/i18n/fr_FR.po @@ -1,4 +1,4 @@ -# Translation of OpenERP Server. +# Translation of OpenERP Server. # This file containt the translation of the following modules: # * account_date_check # @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:23+0000\n" "PO-Revision-Date: 2008-10-10 06:24+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/account_followup/i18n/fr_FR.po b/addons/account_followup/i18n/fr_FR.po index c049727c42f..a07d0248527 100644 --- a/addons/account_followup/i18n/fr_FR.po +++ b/addons/account_followup/i18n/fr_FR.po @@ -1,4 +1,4 @@ -# Translation of OpenERP Server. +# Translation of OpenERP Server. # This file containt the translation of the following modules: # * account_followup # @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:26+0000\n" "PO-Revision-Date: 2008-10-10 06:38+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/account_invoice_layout/i18n/fr_FR.po b/addons/account_invoice_layout/i18n/fr_FR.po index a9ca18bb9d1..2be6ad23d50 100644 --- a/addons/account_invoice_layout/i18n/fr_FR.po +++ b/addons/account_invoice_layout/i18n/fr_FR.po @@ -1,4 +1,4 @@ -# Translation of OpenERP Server. +# Translation of OpenERP Server. # This file containt the translation of the following modules: # * account_invoice_layout # @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:12+0000\n" "PO-Revision-Date: 2008-10-10 06:56+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/account_payment/i18n/fr_FR.po b/addons/account_payment/i18n/fr_FR.po index f027750f355..522d2090995 100644 --- a/addons/account_payment/i18n/fr_FR.po +++ b/addons/account_payment/i18n/fr_FR.po @@ -1,4 +1,4 @@ -# Translation of OpenERP Server. +# Translation of OpenERP Server. # This file containt the translation of the following modules: # * account_payment # @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:29+0000\n" "PO-Revision-Date: 2008-10-10 08:14+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/account_report/i18n/fr_FR.po b/addons/account_report/i18n/fr_FR.po index a07a3fac826..d0533294cdc 100644 --- a/addons/account_report/i18n/fr_FR.po +++ b/addons/account_report/i18n/fr_FR.po @@ -1,4 +1,4 @@ -# Translation of OpenERP Server. +# Translation of OpenERP Server. # This file containt the translation of the following modules: # * account_report # @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:23+0000\n" "PO-Revision-Date: 2008-10-10 08:15+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/account_reporting/i18n/fr_FR.po b/addons/account_reporting/i18n/fr_FR.po index 6566ce92e4c..719e6858649 100644 --- a/addons/account_reporting/i18n/fr_FR.po +++ b/addons/account_reporting/i18n/fr_FR.po @@ -1,4 +1,4 @@ -# Translation of OpenERP Server. +# Translation of OpenERP Server. # This file containt the translation of the following modules: # * account_reporting # @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:32+0000\n" "PO-Revision-Date: 2008-10-09 14:29+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/account_tax_include/i18n/fr_FR.po b/addons/account_tax_include/i18n/fr_FR.po index 003361b5d18..a6476a11f95 100644 --- a/addons/account_tax_include/i18n/fr_FR.po +++ b/addons/account_tax_include/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:27+0000\n" "PO-Revision-Date: 2008-10-09 20:00+0000\n" "Last-Translator: Fabien Pinckaers \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/account_voucher/i18n/fr_FR.po b/addons/account_voucher/i18n/fr_FR.po index 6ec496a2713..5b0e0c59caf 100644 --- a/addons/account_voucher/i18n/fr_FR.po +++ b/addons/account_voucher/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-10-28 11:52:53+0000\n" "PO-Revision-Date: 2008-10-28 11:52:53+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/auction/i18n/fr_FR.po b/addons/auction/i18n/fr_FR.po index 5c4dbb35cbb..18a838e22e2 100644 --- a/addons/auction/i18n/fr_FR.po +++ b/addons/auction/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:25+0000\n" "PO-Revision-Date: 2008-10-14 15:04+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/base_contact/i18n/fr_FR.po b/addons/base_contact/i18n/fr_FR.po index d86d9a89c17..d0b36a795c8 100644 --- a/addons/base_contact/i18n/fr_FR.po +++ b/addons/base_contact/i18n/fr_FR.po @@ -1,4 +1,4 @@ -# Translation of OpenERP Server. +# Translation of OpenERP Server. # This file containt the translation of the following modules: # * base_contact # @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:33+0000\n" "PO-Revision-Date: 2008-10-08 14:13+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/base_iban/i18n/fr_FR.po b/addons/base_iban/i18n/fr_FR.po index 5c20bab3839..acbd15d9580 100644 --- a/addons/base_iban/i18n/fr_FR.po +++ b/addons/base_iban/i18n/fr_FR.po @@ -1,4 +1,4 @@ -# Translation of OpenERP Server. +# Translation of OpenERP Server. # This file containt the translation of the following modules: # * base_iban # @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-10 15:05:34+0000\n" "PO-Revision-Date: 2008-09-10 15:05:34+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/base_module_publish/i18n/fr_FR.po b/addons/base_module_publish/i18n/fr_FR.po index b8e462790ec..a33a98ce441 100644 --- a/addons/base_module_publish/i18n/fr_FR.po +++ b/addons/base_module_publish/i18n/fr_FR.po @@ -1,4 +1,4 @@ -# Translation of OpenERP Server. +# Translation of OpenERP Server. # This file containt the translation of the following modules: # * base_module_publish # @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-10 15:05:35+0000\n" "PO-Revision-Date: 2008-09-10 15:05:35+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/base_module_record/i18n/fr_FR.po b/addons/base_module_record/i18n/fr_FR.po index 532f86ae250..a5de6a202a2 100644 --- a/addons/base_module_record/i18n/fr_FR.po +++ b/addons/base_module_record/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:34+0000\n" "PO-Revision-Date: 2008-10-14 13:08+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/base_report_creator/i18n/fr_FR.po b/addons/base_report_creator/i18n/fr_FR.po index 5237002fb22..72cb8147712 100644 --- a/addons/base_report_creator/i18n/fr_FR.po +++ b/addons/base_report_creator/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:30+0000\n" "PO-Revision-Date: 2008-10-13 17:15+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/base_report_designer/i18n/fr_FR.po b/addons/base_report_designer/i18n/fr_FR.po index 27aec6725d8..aed92c83aac 100644 --- a/addons/base_report_designer/i18n/fr_FR.po +++ b/addons/base_report_designer/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:24+0000\n" "PO-Revision-Date: 2008-10-13 17:20+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/base_setup/i18n/fr_FR.po b/addons/base_setup/i18n/fr_FR.po index 2025186eabe..bd97fffa368 100644 --- a/addons/base_setup/i18n/fr_FR.po +++ b/addons/base_setup/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-11-02 20:23:25+0000\n" "PO-Revision-Date: 2008-11-02 20:23:25+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/base_vat/i18n/fr_FR.po b/addons/base_vat/i18n/fr_FR.po index 0ff38b3aaf9..391beeb951b 100644 --- a/addons/base_vat/i18n/fr_FR.po +++ b/addons/base_vat/i18n/fr_FR.po @@ -1,4 +1,4 @@ -# Translation of OpenERP Server. +# Translation of OpenERP Server. # This file containt the translation of the following modules: # * base_vat # @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:34+0000\n" "PO-Revision-Date: 2008-09-10 15:05:35+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/board/i18n/fr_FR.po b/addons/board/i18n/fr_FR.po index 0412c1f1d86..120f4871850 100644 --- a/addons/board/i18n/fr_FR.po +++ b/addons/board/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-11-02 20:23:25+0000\n" "PO-Revision-Date: 2008-11-02 20:23:25+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/board_account/i18n/fr_FR.po b/addons/board_account/i18n/fr_FR.po index 6f3e340eeee..8ba8973bee0 100644 --- a/addons/board_account/i18n/fr_FR.po +++ b/addons/board_account/i18n/fr_FR.po @@ -1,4 +1,4 @@ -# Translation of OpenERP Server. +# Translation of OpenERP Server. # This file containt the translation of the following modules: # * board_account # @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-10 15:05:35+0000\n" "PO-Revision-Date: 2008-09-10 15:05:35+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/board_association/i18n/fr_FR.po b/addons/board_association/i18n/fr_FR.po index a97821e8b0a..646a2069736 100644 --- a/addons/board_association/i18n/fr_FR.po +++ b/addons/board_association/i18n/fr_FR.po @@ -1,4 +1,4 @@ -# Translation of OpenERP Server. +# Translation of OpenERP Server. # This file containt the translation of the following modules: # * board_association # @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-10 15:05:35+0000\n" "PO-Revision-Date: 2008-09-10 15:05:35+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/board_auction/i18n/fr_FR.po b/addons/board_auction/i18n/fr_FR.po index 481f87b7553..ef1606298d7 100644 --- a/addons/board_auction/i18n/fr_FR.po +++ b/addons/board_auction/i18n/fr_FR.po @@ -1,4 +1,4 @@ -# Translation of OpenERP Server. +# Translation of OpenERP Server. # This file containt the translation of the following modules: # * board_auction # @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:23+0000\n" "PO-Revision-Date: 2008-10-13 08:03+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/board_crm_configuration/i18n/fr_FR.po b/addons/board_crm_configuration/i18n/fr_FR.po index a1eabe03b08..17812076074 100644 --- a/addons/board_crm_configuration/i18n/fr_FR.po +++ b/addons/board_crm_configuration/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-11-02 20:23:25+0000\n" "PO-Revision-Date: 2008-11-02 20:23:25+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/board_document/i18n/fr_FR.po b/addons/board_document/i18n/fr_FR.po index a7373ac3879..d68cbcbc864 100644 --- a/addons/board_document/i18n/fr_FR.po +++ b/addons/board_document/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-10-28 11:31:29+0000\n" "PO-Revision-Date: 2008-10-28 11:31:29+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/board_manufacturing/i18n/fr_FR.po b/addons/board_manufacturing/i18n/fr_FR.po index 99928f0f9a2..29106187935 100644 --- a/addons/board_manufacturing/i18n/fr_FR.po +++ b/addons/board_manufacturing/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-11-02 20:23:25+0000\n" "PO-Revision-Date: 2008-11-02 20:23:25+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/board_project/i18n/fr_FR.po b/addons/board_project/i18n/fr_FR.po index 45e6cae41ee..e0801f86575 100644 --- a/addons/board_project/i18n/fr_FR.po +++ b/addons/board_project/i18n/fr_FR.po @@ -1,4 +1,4 @@ -# Translation of OpenERP Server. +# Translation of OpenERP Server. # This file containt the translation of the following modules: # * board_project # @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:28+0000\n" "PO-Revision-Date: 2008-10-13 08:15+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/board_sale/i18n/fr_FR.po b/addons/board_sale/i18n/fr_FR.po index 7ea4f87c053..bd42bffd826 100644 --- a/addons/board_sale/i18n/fr_FR.po +++ b/addons/board_sale/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:28+0000\n" "PO-Revision-Date: 2008-10-13 08:53+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/crm/i18n/fr_FR.po b/addons/crm/i18n/fr_FR.po index c0b60aa14c3..c60706520e0 100644 --- a/addons/crm/i18n/fr_FR.po +++ b/addons/crm/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-11-02 20:23:25+0000\n" "PO-Revision-Date: 2008-11-02 20:23:25+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/crm_configuration/i18n/fr_FR.po b/addons/crm_configuration/i18n/fr_FR.po index 703df9d2566..777de29571e 100644 --- a/addons/crm_configuration/i18n/fr_FR.po +++ b/addons/crm_configuration/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-11-02 20:23:25+0000\n" "PO-Revision-Date: 2008-11-02 20:23:25+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/crm_profiling/i18n/fr_FR.po b/addons/crm_profiling/i18n/fr_FR.po index f07f644538b..6a71118231e 100644 --- a/addons/crm_profiling/i18n/fr_FR.po +++ b/addons/crm_profiling/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:30+0000\n" "PO-Revision-Date: 2008-10-13 10:18+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index 52bf075ad65..0c008c5db55 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -125,7 +125,8 @@ - + + @@ -136,7 +137,7 @@ stock.picking - + diff --git a/addons/delivery/i18n/fr_FR.po b/addons/delivery/i18n/fr_FR.po index c8df3800918..bf9995cb3f2 100644 --- a/addons/delivery/i18n/fr_FR.po +++ b/addons/delivery/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-11-02 20:23:25+0000\n" "PO-Revision-Date: 2008-11-02 20:23:25+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py index a7889b494c2..76498dc8cbd 100644 --- a/addons/delivery/sale.py +++ b/addons/delivery/sale.py @@ -30,6 +30,7 @@ class sale_order(osv.osv): _description = "Sale Order" _columns = { + 'id': fields.integer('ID', readonly=True,invisible=True), 'carrier_id':fields.many2one("delivery.carrier","Delivery method", help="Complete this field if you plan to invoice the shipping based on packings made."), } diff --git a/addons/document/document.py b/addons/document/document.py index 153212859e5..a59c1a0d619 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -95,8 +95,7 @@ class node_class(object): where.append( ('parent_id','=',self.object.id) ) where.append( ('res_id','=',False) ) if nodename: - where.append( (fobj._rec_name,'=',nodename) ) - print where+[ ('parent_id','=',self.object and self.object.id or False) ] + where.append( (fobj._rec_name,'=',nodename) ) ids = fobj.search(self.cr, self.uid, where+[ ('parent_id','=',self.object and self.object.id or False) ], context=self.context) if self.object and self.root and (self.object.type=='ressource'): ids += fobj.search(self.cr, self.uid, where+[ ('parent_id','=',False) ], context=self.context) @@ -248,27 +247,7 @@ class document_directory(osv.osv): path.append(self.pool.get(directory.ressource_type_id.model).browse(cr,uid,res_id).name) user=self.pool.get('res.users').browse(cr,uid,uid) return "ftp://%s:%s@localhost:8021/%s/%s"%(user.login,user.password,cr.dbname,'/'.join(path)) - return False - def _check_duplication(self, cr, uid,vals): - if 'name' in vals: - where=" name='%s'"% (vals['name']) - if not 'parent_id' in vals or not vals['parent_id']: - where+=' and parent_id is null' - else: - where+=' and parent_id=%d'%(vals['parent_id']) - if not 'ressource_parent_type_id' in vals or not vals['ressource_parent_type_id']: - where+= ' and ressource_parent_type_id is null' - else: - where+=" and ressource_parent_type_id='%s'"%(vals['ressource_parent_type_id']) -# if not 'ressource_id' in vals or not vals['ressource_id']: -# where+= ' and ressource_id is null' -# else: -# where+=" and ressource_id=%d"%(vals['ressource_id']) - cr.execute("select id from document_directory where" + where) - res = cr.fetchall() - if len(res): - return False - return True + return False def _check_recursion(self, cr, uid, ids): level = 100 while len(ids): @@ -344,13 +323,7 @@ class document_directory(osv.osv): result = map(lambda node: node.path_get(), children) #childs,object2 = self._get_childs(cr, uid, object, False, context) #result = map(lambda x: urlparse.urljoin(path+'/',x.name), childs) - return result - - def write(self, cr, uid, ids, vals, context=None): - # need to make constraints to checking duplicate - #if not self._check_duplication(cr,uid,vals): - # raise except_orm('ValidateError', 'Directory name must be unique!') - return super(document_directory,self).write(cr,uid,ids,vals,context=context) + return result def copy(self, cr, uid, id, default=None, context=None): if not default: @@ -359,9 +332,37 @@ class document_directory(osv.osv): default.update({'name': name+ " (copy)"}) return super(document_directory,self).copy(cr,uid,id,default,context) + def _check_duplication(self, cr, uid,vals,ids=[],op='create'): + name=vals.get('name',False) + parent_id=vals.get('parent_id',False) + ressource_parent_type_id=vals.get('ressource_parent_type_id',False) + ressource_id=vals.get('ressource_id',0) + if op=='write': + for directory in self.browse(cr,uid,ids): + if not name: + name=directory.name + if not parent_id: + parent_id=directory.parent_id and directory.parent_id.id or False + if not ressource_parent_type_id: + ressource_parent_type_id=directory.ressource_parent_type_id and directory.ressource_parent_type_id.id or False + if not ressource_id: + ressource_id=directory.ressource_id and directory.ressource_id.id or 0 + res=self.search(cr,uid,[('id','<>',directory.id),('name','=',name),('parent_id','=',parent_id),('ressource_parent_type_id','=',ressource_parent_type_id),('ressource_id','=',ressource_id)]) + if len(res): + return False + if op=='create': + res=self.search(cr,uid,[('name','=',name),('parent_id','=',parent_id),('ressource_parent_type_id','=',ressource_parent_type_id),('ressource_id','=',ressource_id)]) + if len(res): + return False + return True + def write(self, cr, uid, ids, vals, context=None): + if not self._check_duplication(cr,uid,vals,ids,op='write'): + raise except_orm('ValidateError', 'Directory name must be unique!') + return super(document_directory,self).write(cr,uid,ids,vals,context=context) + def create(self, cr, uid, vals, context=None): if not self._check_duplication(cr,uid,vals): - raise except_orm('ValidateError', 'Directory name must be unique!') + raise except_orm('ValidateError', 'Directory name must be unique!') if vals.get('name',False) and (vals.get('name').find('/')+1 or vals.get('name').find('@')+1 or vals.get('name').find('$')+1 or vals.get('name').find('#')+1) : raise 'Error' return super(document_directory,self).create(cr, uid, vals, context) @@ -548,18 +549,39 @@ class document_file(osv.osv): } _sql_constraints = [ ('filename_uniq', 'unique (name,parent_id,res_id,res_model)', 'The file name must be unique !') - ] - - def _check_duplication(self, cr, uid,vals): - if 'name' in vals: - res=self.search(cr,uid,[('name','=',vals['name']),('parent_id','=','parent_id' in vals and vals['parent_id'] or False),('res_id','=','res_id' in vals and vals['res_id'] or False),('res_model','=','res_model' in vals and vals['res_model']) or False]) + ] + def _check_duplication(self, cr, uid,vals,ids=[],op='create'): + name=vals.get('name',False) + parent_id=vals.get('parent_id',False) + res_model=vals.get('res_model',False) + res_id=vals.get('res_id',0) + if op=='write': + for file in self.browse(cr,uid,ids): + if not name: + name=file.name + if not parent_id: + parent_id=file.parent_id and file.parent_id.id or False + if not res_model: + res_model=file.res_model and file.res_model or False + if not res_id: + res_id=file.res_id and file.res_id or 0 + res=self.search(cr,uid,[('id','<>',file.id),('name','=',name),('parent_id','=',parent_id),('res_model','=',res_model),('res_id','=',res_id)]) + if len(res): + return False + if op=='create': + res=self.search(cr,uid,[('name','=',name),('parent_id','=',parent_id),('res_id','=',res_id),('res_model','=',res_model)]) if len(res): return False return True - - def write(self, cr, uid, ids, vals, context=None): - if not self._check_duplication(cr,uid,vals): - raise except_orm('ValidateError', 'File name must be unique!') + def copy(self, cr, uid, id, default=None, context=None): + if not default: + default ={} + name = self.read(cr, uid, [id])[0]['name'] + default.update({'name': name+ " (copy)"}) + return super(document_file,self).copy(cr,uid,id,default,context) + def write(self, cr, uid, ids, vals, context=None): + if not self._check_duplication(cr,uid,vals,ids,'write'): + raise except_orm('ValidateError', 'File name must be unique!') result = super(document_file,self).write(cr,uid,ids,vals,context=context) cr.commit() try: @@ -575,8 +597,12 @@ class document_file(osv.osv): pass return result - def create(self, cr, uid, vals, context={}): + def create(self, cr, uid, vals, context={}): vals['title']=vals['name'] + if not vals.get('res_id', False) and context.get('default_res_id',False): + vals['res_id']=context.get('default_res_id',False) + if not vals.get('res_model', False) and context.get('default_res_model',False): + vals['res_model']=context.get('default_res_model',False) if vals.get('res_id', False) and vals.get('res_model',False): obj_model=self.pool.get(vals['res_model']) result = obj_model.read(cr, uid, [vals['res_id']], context=context) @@ -585,18 +611,22 @@ class document_file(osv.osv): vals['title'] = (obj['name'] or '')[:60] if obj_model._name=='res.partner': vals['partner_id']=obj['id'] - elif 'address_id' in obj: - address=self.pool.get('res.partner.address').read(cr,uid,[obj['address_id']],context=context) + elif obj.get('address_id',False): + if isinstance(obj['address_id'],tuple) or isinstance(obj['address_id'],list): + address_id=obj['address_id'][0] + else: + address_id=obj['address_id'] + address=self.pool.get('res.partner.address').read(cr,uid,[address_id],context=context) if len(address): - vals['partner_id']=address[0]['partner_id'] or False - elif 'partner_id' in obj: + vals['partner_id']=address[0]['partner_id'][0] or False + elif obj.get('partner_id',False): if isinstance(obj['partner_id'],tuple) or isinstance(obj['partner_id'],list): vals['partner_id']=obj['partner_id'][0] else: vals['partner_id']=obj['partner_id'] datas=None - if 'datas' not in vals: + if vals.get('datas',False) and vals.get('link',False) : import urllib datas=base64.encodestring(urllib.urlopen(vals['link']).read()) else: diff --git a/addons/document/i18n/fr_FR.po b/addons/document/i18n/fr_FR.po index 1b52b4bf0c5..6a7cf9b53b0 100644 --- a/addons/document/i18n/fr_FR.po +++ b/addons/document/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-10-28 10:07:49+0000\n" "PO-Revision-Date: 2008-11-02 17:56+0100\n" "Last-Translator: Christophe Chauvet \n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/event/event.py b/addons/event/event.py index d1058f6cf1e..0c849f6e03b 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution +# OpenERP, Open Source Management Solution # Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved # $Id$ # @@ -237,7 +237,8 @@ class event_registration(osv.osv): _defaults = { 'nb_register': lambda *a: 1, 'tobe_invoiced' : lambda *a: True, - 'name': lambda *a: 'Registration' + 'name': lambda *a: 'Registration', + 'state': lambda *b: 'draft' } def onchange_badge_name(self, cr, uid, ids, badge_name): diff --git a/addons/event/i18n/fr_FR.po b/addons/event/i18n/fr_FR.po index 7e17a0929c6..83d3d7cc48e 100644 --- a/addons/event/i18n/fr_FR.po +++ b/addons/event/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:31+0000\n" "PO-Revision-Date: 2008-10-13 11:02+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/google_map/i18n/fr_FR.po b/addons/google_map/i18n/fr_FR.po index 7ead04c08b0..5a37abbf80e 100644 --- a/addons/google_map/i18n/fr_FR.po +++ b/addons/google_map/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:23+0000\n" "PO-Revision-Date: 2008-10-11 07:06+0000\n" "Last-Translator: Christophe Chauvet \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/hr/i18n/fr_FR.po b/addons/hr/i18n/fr_FR.po index f2214d8e81b..ae517a3a5e7 100644 --- a/addons/hr/i18n/fr_FR.po +++ b/addons/hr/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-11-02 20:23:25+0000\n" "PO-Revision-Date: 2008-11-02 20:23:25+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/hr_attendance/i18n/fr_FR.po b/addons/hr_attendance/i18n/fr_FR.po index 7d3212412aa..dbfa83eceec 100644 --- a/addons/hr_attendance/i18n/fr_FR.po +++ b/addons/hr_attendance/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-10-28 09:40:44+0000\n" "PO-Revision-Date: 2008-10-28 09:40:44+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/hr_contract/i18n/fr_FR.po b/addons/hr_contract/i18n/fr_FR.po index 3d3d3dbcf2a..7acf5e21a2e 100644 --- a/addons/hr_contract/i18n/fr_FR.po +++ b/addons/hr_contract/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:25+0000\n" "PO-Revision-Date: 2008-10-13 11:14+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/hr_expense/i18n/fr_FR.po b/addons/hr_expense/i18n/fr_FR.po index bf065f55e63..5c0c31a4dd0 100644 --- a/addons/hr_expense/i18n/fr_FR.po +++ b/addons/hr_expense/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:25+0000\n" "PO-Revision-Date: 2008-10-13 11:30+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml index 2b39a7ba99d..d9a39e5af23 100644 --- a/addons/hr_holidays/hr_view.xml +++ b/addons/hr_holidays/hr_view.xml @@ -35,8 +35,7 @@ hr.holidays.tree - hr.holidays - + hr.holidays tree @@ -54,8 +53,7 @@ hr.holidays.status.form - hr.holidays.status - + hr.holidays.status form
@@ -69,8 +67,7 @@ hr.holidays.status.tree - hr.holidays.status - + hr.holidays.status tree @@ -145,7 +142,7 @@ hr.holidays form - + \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/hr_timesheet/i18n/fr_FR.po b/addons/hr_timesheet/i18n/fr_FR.po index fda6d1ca2da..c9fcdb651b4 100644 --- a/addons/hr_timesheet/i18n/fr_FR.po +++ b/addons/hr_timesheet/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:28+0000\n" "PO-Revision-Date: 2008-10-13 15:49+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/hr_timesheet_invoice/i18n/fr_FR.po b/addons/hr_timesheet_invoice/i18n/fr_FR.po index be09f6d127c..8e167ae2b4a 100644 --- a/addons/hr_timesheet_invoice/i18n/fr_FR.po +++ b/addons/hr_timesheet_invoice/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:22+0000\n" "PO-Revision-Date: 2008-10-13 12:01+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/hr_timesheet_project/i18n/fr_FR.po b/addons/hr_timesheet_project/i18n/fr_FR.po index f483483c7f5..db39be460e9 100644 --- a/addons/hr_timesheet_project/i18n/fr_FR.po +++ b/addons/hr_timesheet_project/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:09+0000\n" "PO-Revision-Date: 2008-10-13 12:02+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/hr_timesheet_sheet/i18n/fr_FR.po b/addons/hr_timesheet_sheet/i18n/fr_FR.po index 9b5c9328e75..fed9b7ce4fe 100644 --- a/addons/hr_timesheet_sheet/i18n/fr_FR.po +++ b/addons/hr_timesheet_sheet/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:25+0000\n" "PO-Revision-Date: 2008-10-13 12:10+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/idea/i18n/fr_FR.po b/addons/idea/i18n/fr_FR.po index 78245fbe6c0..4a069001475 100644 --- a/addons/idea/i18n/fr_FR.po +++ b/addons/idea/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:29+0000\n" "PO-Revision-Date: 2008-10-13 16:48+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/l10n_be/i18n/fr_FR.po b/addons/l10n_be/i18n/fr_FR.po index 4968f890d53..d252d00dfc2 100644 --- a/addons/l10n_be/i18n/fr_FR.po +++ b/addons/l10n_be/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:24+0000\n" "PO-Revision-Date: 2008-10-13 12:11+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/l10n_chart_uk_minimal/i18n/fr_FR.po b/addons/l10n_chart_uk_minimal/i18n/fr_FR.po index e363fa287cd..e81e4372d9f 100644 --- a/addons/l10n_chart_uk_minimal/i18n/fr_FR.po +++ b/addons/l10n_chart_uk_minimal/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:31+0000\n" "PO-Revision-Date: 2008-10-14 13:30+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/l10n_fr/i18n/fr_FR.po b/addons/l10n_fr/i18n/fr_FR.po index 9124295c3a5..1e2f50610b4 100644 --- a/addons/l10n_fr/i18n/fr_FR.po +++ b/addons/l10n_fr/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:45+0000\n" "PO-Revision-Date: 2008-10-14 13:30+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/l10n_lu/account.report.report.csv b/addons/l10n_lu/account.report.report.csv index 0e4095972fc..89e497ce8c6 100644 --- a/addons/l10n_lu/account.report.report.csv +++ b/addons/l10n_lu/account.report.report.csv @@ -1,7 +1,7 @@ "expression","note","parent_id","sequence","badness_limit","goodness_limit","type","code","name" 0,,,,0,1,"indicator","BILAN","Bilan" "report('BIMMO','BSTOCK','BREAL','BDISPO')",,"BILAN",,0,1,"fiscal","Actif","Actif" -"balance(][2'])",,"Actif",,0,1,"indicator","BIMMO","Valeurs immobilisées" +"balance(['2'])",,"Actif",,0,1,"indicator","BIMMO","Valeurs immobilisées" "balance(['3']",,"Actif",2,0,1,"indicator","BSTOCK","Stocks" "balance(['4'])",,"Actif",3,0,1,"indicator","BREAL","Réalisable" "balance(['5'])",,"Actif",4,0,1,"fiscal","BDISPO","Disponible" diff --git a/addons/membership/i18n/fr_FR.po b/addons/membership/i18n/fr_FR.po index 0b3dd6ec9b7..45814e6ddb0 100644 --- a/addons/membership/i18n/fr_FR.po +++ b/addons/membership/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:32+0000\n" "PO-Revision-Date: 2008-10-13 12:39+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/mrp/i18n/fr_FR.po b/addons/mrp/i18n/fr_FR.po index c84261e225c..257f3650b9a 100644 --- a/addons/mrp/i18n/fr_FR.po +++ b/addons/mrp/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-11-02 20:23:25+0000\n" "PO-Revision-Date: 2008-11-02 20:23:25+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/mrp_operations/i18n/fr_FR.po b/addons/mrp_operations/i18n/fr_FR.po index 1f906859ddf..d6e74218b2b 100644 --- a/addons/mrp_operations/i18n/fr_FR.po +++ b/addons/mrp_operations/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:29+0000\n" "PO-Revision-Date: 2008-10-13 13:44+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/point_of_sale/i18n/fr_FR.po b/addons/point_of_sale/i18n/fr_FR.po index d4592e134ca..ccc671afd80 100644 --- a/addons/point_of_sale/i18n/fr_FR.po +++ b/addons/point_of_sale/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:32+0000\n" "PO-Revision-Date: 2008-10-13 14:37+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/process/i18n/fr_FR.po b/addons/process/i18n/fr_FR.po index d1fe70d6378..5be41f365d8 100644 --- a/addons/process/i18n/fr_FR.po +++ b/addons/process/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-11-02 20:23:25+0000\n" "PO-Revision-Date: 2008-11-02 20:23:25+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/product/i18n/fr_FR.po b/addons/product/i18n/fr_FR.po index 348c2870ca6..5ffa0a436da 100644 --- a/addons/product/i18n/fr_FR.po +++ b/addons/product/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-11-02 20:23:25+0000\n" "PO-Revision-Date: 2008-11-02 20:23:25+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/product_margin/i18n/fr_FR.po b/addons/product_margin/i18n/fr_FR.po index a09bf4309b5..08692dbaec7 100644 --- a/addons/product_margin/i18n/fr_FR.po +++ b/addons/product_margin/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-11-02 20:23:25+0000\n" "PO-Revision-Date: 2008-11-02 20:23:25+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/profile_accounting/i18n/fr_FR.po b/addons/profile_accounting/i18n/fr_FR.po index 9774d5dfb02..6b2e5fb184b 100644 --- a/addons/profile_accounting/i18n/fr_FR.po +++ b/addons/profile_accounting/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:21+0000\n" "PO-Revision-Date: 2008-10-13 14:51+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/profile_association/i18n/fr_FR.po b/addons/profile_association/i18n/fr_FR.po index 086b2c27a2e..738b6767e55 100644 --- a/addons/profile_association/i18n/fr_FR.po +++ b/addons/profile_association/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:29+0000\n" "PO-Revision-Date: 2008-10-13 15:24+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/profile_manufacturing/i18n/fr_FR.po b/addons/profile_manufacturing/i18n/fr_FR.po index 8ef859baa45..548d53ea7e5 100644 --- a/addons/profile_manufacturing/i18n/fr_FR.po +++ b/addons/profile_manufacturing/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-11-02 20:23:25+0000\n" "PO-Revision-Date: 2008-11-02 20:23:25+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/profile_service/i18n/fr_FR.po b/addons/profile_service/i18n/fr_FR.po index a9080965c1a..4d2abdf906c 100644 --- a/addons/profile_service/i18n/fr_FR.po +++ b/addons/profile_service/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:28+0000\n" "PO-Revision-Date: 2008-10-13 16:01+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/project/i18n/fr_FR.po b/addons/project/i18n/fr_FR.po index 0291f600abc..16047117421 100644 --- a/addons/project/i18n/fr_FR.po +++ b/addons/project/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:19+0000\n" "PO-Revision-Date: 2008-10-13 15:06+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/project_gtd/i18n/fr_FR.po b/addons/project_gtd/i18n/fr_FR.po index b218633cdcb..7113acb5206 100644 --- a/addons/project_gtd/i18n/fr_FR.po +++ b/addons/project_gtd/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:25+0000\n" "PO-Revision-Date: 2008-10-14 10:24+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/project_mrp/i18n/fr_FR.po b/addons/project_mrp/i18n/fr_FR.po index 3108a9f2cb3..63e639de98c 100644 --- a/addons/project_mrp/i18n/fr_FR.po +++ b/addons/project_mrp/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-11 15:41:42+0000\n" "PO-Revision-Date: 2008-09-11 15:41:42+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/project_timesheet/i18n/fr_FR.po b/addons/project_timesheet/i18n/fr_FR.po index 47892ea8f3f..1ad9e87b250 100644 --- a/addons/project_timesheet/i18n/fr_FR.po +++ b/addons/project_timesheet/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-11 15:41:42+0000\n" "PO-Revision-Date: 2008-09-11 15:41:42+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/purchase/i18n/fr_FR.po b/addons/purchase/i18n/fr_FR.po index 89974e5693d..a36f37d2f4b 100644 --- a/addons/purchase/i18n/fr_FR.po +++ b/addons/purchase/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-11-02 20:23:25+0000\n" "PO-Revision-Date: 2008-11-02 20:23:25+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/purchase_analytic_plans/i18n/fr_FR.po b/addons/purchase_analytic_plans/i18n/fr_FR.po index dc322fd9e68..c58279cea5f 100644 --- a/addons/purchase_analytic_plans/i18n/fr_FR.po +++ b/addons/purchase_analytic_plans/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:23+0000\n" "PO-Revision-Date: 2008-10-13 16:35+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/report_account/i18n/fr_FR.po b/addons/report_account/i18n/fr_FR.po index 099515aedfa..bf1da88ebb4 100644 --- a/addons/report_account/i18n/fr_FR.po +++ b/addons/report_account/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-11 15:41:43+0000\n" "PO-Revision-Date: 2008-09-11 15:41:43+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/report_analytic/i18n/fr_FR.po b/addons/report_analytic/i18n/fr_FR.po index 80561646c20..6db892098e6 100644 --- a/addons/report_analytic/i18n/fr_FR.po +++ b/addons/report_analytic/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:28+0000\n" "PO-Revision-Date: 2008-10-13 16:54+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/report_analytic_line/i18n/fr_FR.po b/addons/report_analytic_line/i18n/fr_FR.po index 2648464e39d..d04a95c4171 100644 --- a/addons/report_analytic_line/i18n/fr_FR.po +++ b/addons/report_analytic_line/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:34+0000\n" "PO-Revision-Date: 2008-10-13 16:52+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/report_analytic_planning/i18n/fr_FR.po b/addons/report_analytic_planning/i18n/fr_FR.po index 3b2b9131f62..5311cfe7b08 100644 --- a/addons/report_analytic_planning/i18n/fr_FR.po +++ b/addons/report_analytic_planning/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:26+0000\n" "PO-Revision-Date: 2008-10-13 16:52+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/report_crm/i18n/fr_FR.po b/addons/report_crm/i18n/fr_FR.po index 08631176e0f..835dd4b8e14 100644 --- a/addons/report_crm/i18n/fr_FR.po +++ b/addons/report_crm/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-11-02 20:23:25+0000\n" "PO-Revision-Date: 2008-11-02 20:23:25+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/report_document/i18n/fr_FR.po b/addons/report_document/i18n/fr_FR.po index 430df5d0c35..800ceb58ac7 100644 --- a/addons/report_document/i18n/fr_FR.po +++ b/addons/report_document/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-10-28 08:12:59+0000\n" "PO-Revision-Date: 2008-10-28 08:12:59+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/report_intrastat/i18n/fr_FR.po b/addons/report_intrastat/i18n/fr_FR.po index d22c81106b0..fa4a05bf24a 100644 --- a/addons/report_intrastat/i18n/fr_FR.po +++ b/addons/report_intrastat/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:28+0000\n" "PO-Revision-Date: 2008-10-11 07:01+0000\n" "Last-Translator: Christophe Chauvet \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/report_mrp/i18n/fr_FR.po b/addons/report_mrp/i18n/fr_FR.po index d5446827c54..5a325ca4f8e 100644 --- a/addons/report_mrp/i18n/fr_FR.po +++ b/addons/report_mrp/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-11-02 20:23:25+0000\n" "PO-Revision-Date: 2008-11-02 20:23:25+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/report_project/i18n/fr_FR.po b/addons/report_project/i18n/fr_FR.po index a7044273806..886e1f8742b 100644 --- a/addons/report_project/i18n/fr_FR.po +++ b/addons/report_project/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-11 15:41:43+0000\n" "PO-Revision-Date: 2008-09-11 15:41:43+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/report_purchase/i18n/fr_FR.po b/addons/report_purchase/i18n/fr_FR.po index 2ec78c38cde..71c54cfe170 100644 --- a/addons/report_purchase/i18n/fr_FR.po +++ b/addons/report_purchase/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:19+0000\n" "PO-Revision-Date: 2008-10-11 06:39+0000\n" "Last-Translator: Christophe Chauvet \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/report_sale/i18n/fr_FR.po b/addons/report_sale/i18n/fr_FR.po index 1ea4892a0af..50bb7b93fec 100644 --- a/addons/report_sale/i18n/fr_FR.po +++ b/addons/report_sale/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:23+0000\n" "PO-Revision-Date: 2008-10-11 06:26+0000\n" "Last-Translator: Christophe Chauvet \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/report_timesheet/i18n/fr_FR.po b/addons/report_timesheet/i18n/fr_FR.po index 339aba59689..dd3c23f8a5d 100644 --- a/addons/report_timesheet/i18n/fr_FR.po +++ b/addons/report_timesheet/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:24+0000\n" "PO-Revision-Date: 2008-10-11 07:04+0000\n" "Last-Translator: Christophe Chauvet \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/sale/i18n/fr_FR.po b/addons/sale/i18n/fr_FR.po index f7e33352325..89a41a2bff9 100644 --- a/addons/sale/i18n/fr_FR.po +++ b/addons/sale/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-11-02 20:23:25+0000\n" "PO-Revision-Date: 2008-11-02 20:23:25+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -901,8 +901,8 @@ msgstr "Uniquement les Commandes de Livraison" #. module: sale #, python-format #: code:addons/sale/wizard/make_invoice_advance.py:0 -msgid "You cannot make an advance on a sale order that is defined as \'Automatic Invoice after delivery\'." -msgstr "Vous ne pouvez pas faire une avance sur une commande client définie comme \'Facture automatique après livraison\'." +msgid "You cannot make an advance on a sale order that is defined as 'Automatic Invoice after delivery'." +msgstr "Vous ne pouvez pas faire une avance sur une commande client définie comme 'Facture automatique après livraison'." #. module: sale #: rml:sale.order:0 diff --git a/addons/sale/report/shipping.rml b/addons/sale/report/shipping.rml index 3e8f1105cde..eb33a84c022 100644 --- a/addons/sale/report/shipping.rml +++ b/addons/sale/report/shipping.rml @@ -113,16 +113,16 @@ - [[ not(o.sale_id) and 'Error, no sale order attached to this picking !' or '' ]] + [[ not(o.origin) and 'Error, no sale order attached to this picking !' or '' ]] Invoiced to - [[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.name or '']] - [[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.street or '']] - [[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.zip or '']] - [[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.city or '' ]] - [[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.country_id and o.sale_id.partner_invoice_id.country_id.name or '']] + [[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.name or '' ]] + [[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.street or '']] + [[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.zip or '']] + [[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.city or '' ]] + [[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.country_id and o.address_id and o.address_id.partner_id and o.address_id.partner_id.name or '']] [[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.name or '']] @@ -159,7 +159,7 @@ - [[ o.sale_id and o.sale_id.name ]] + [[ o.origin ]] [[ o.sale_id and o.sale_id.date_order or '']] diff --git a/addons/sale/sale.py b/addons/sale/sale.py index be573f70422..88e6946ba17 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -735,6 +735,7 @@ class sale_order_line(osv.osv): a = self.pool.get('account.fiscal.position').map_account(cr, uid, line.order_id.partner_id, a) inv_id = self.pool.get('account.invoice.line').create(cr, uid, { 'name': line.name, + 'origin':line.order_id.name, 'account_id': a, 'price_unit': pu, 'quantity': uosqty, diff --git a/addons/sale/wizard/make_invoice_advance.py b/addons/sale/wizard/make_invoice_advance.py index 58238ebcabd..6d741307924 100644 --- a/addons/sale/wizard/make_invoice_advance.py +++ b/addons/sale/wizard/make_invoice_advance.py @@ -60,7 +60,7 @@ def _createInvoices(self, cr, uid, data, context={}): if sale.order_policy == 'postpaid': raise osv.except_osv( _('Error'), - _('You cannot make an advance on a sale order that is defined as \'Automatic Invoice after delivery\'.')) + _("You cannot make an advance on a sale order that is defined as 'Automatic Invoice after delivery'.")) val = obj_lines.product_id_change(cr, uid, [], data['form']['product_id'],uom = False, partner_id = sale.partner_id.id) line_id =obj_lines.create(cr, uid, { 'name': val['value']['name'], diff --git a/addons/sale_analytic_plans/i18n/fr_FR.po b/addons/sale_analytic_plans/i18n/fr_FR.po index 0355aa81f23..e3987e6074e 100644 --- a/addons/sale_analytic_plans/i18n/fr_FR.po +++ b/addons/sale_analytic_plans/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:25+0000\n" "PO-Revision-Date: 2008-10-13 16:22+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/sale_crm/i18n/fr_FR.po b/addons/sale_crm/i18n/fr_FR.po index 690933e631a..03202bc0c67 100644 --- a/addons/sale_crm/i18n/fr_FR.po +++ b/addons/sale_crm/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:33+0000\n" "PO-Revision-Date: 2008-10-11 08:42+0000\n" "Last-Translator: Christophe Chauvet \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/sale_journal/i18n/fr_FR.po b/addons/sale_journal/i18n/fr_FR.po index 3e2eba754d8..a56a08142d9 100644 --- a/addons/sale_journal/i18n/fr_FR.po +++ b/addons/sale_journal/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 16:04+0000\n" "PO-Revision-Date: 2008-10-13 16:29+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/scrum/i18n/fr_FR.po b/addons/scrum/i18n/fr_FR.po index fbb5bec2116..f99f845f781 100644 --- a/addons/scrum/i18n/fr_FR.po +++ b/addons/scrum/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:28+0000\n" "PO-Revision-Date: 2008-10-14 07:18+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/stock/i18n/fr_FR.po b/addons/stock/i18n/fr_FR.po index becb07c6dce..42f2d35350b 100644 --- a/addons/stock/i18n/fr_FR.po +++ b/addons/stock/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-11-02 20:23:25+0000\n" "PO-Revision-Date: 2008-11-02 20:23:25+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/stock/stock.py b/addons/stock/stock.py index af90192f326..63ecd5a354d 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -625,10 +625,16 @@ class stock_picking(osv.osv): address_contact_id, address_invoice_id = \ self._get_address_invoice(cursor, user, picking).values() - comment = self._get_comment_invoice(cursor, user, picking) - + comment = self._get_comment_invoice(cursor, user, picking) if group and partner.id in invoices_group: invoice_id = invoices_group[partner.id] + invoice=invoice_obj.browse(cursor, user,invoice_id) + invoice_vals = { + 'name': invoice.name +', '+picking.name, + 'origin': invoice.origin+', '+picking.name+(picking.origin and (':' + picking.origin) or ''), + 'comment':(comment and (invoice.comment and invoice.comment+"\n"+comment or comment)) or (invoice.comment and invoice.comment or ''), + } + invoice_obj.write(cursor, user, [invoice_id],invoice_vals,context=context) else: invoice_vals = { 'name': picking.name, @@ -651,6 +657,9 @@ class stock_picking(osv.osv): invoices_group[partner.id] = invoice_id res[picking.id] = invoice_id for move_line in picking.move_lines: + origin=move_line.picking_id.name + if move_line.picking_id.origin: + origin+=':' + move_line.picking_id.origin if group: name = picking.name + '-' + move_line.name else: @@ -679,6 +688,7 @@ class stock_picking(osv.osv): account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, partner, account_id) invoice_line_id = invoice_line_obj.create(cursor, user, { 'name': name, + 'origin':origin, 'invoice_id': invoice_id, 'uos_id': move_line.product_uos.id, 'product_id': move_line.product_id.id, diff --git a/addons/stock_location/i18n/fr_FR.po b/addons/stock_location/i18n/fr_FR.po index ab640bcbbed..25b3fb7e8e3 100644 --- a/addons/stock_location/i18n/fr_FR.po +++ b/addons/stock_location/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-11 15:41:43+0000\n" "PO-Revision-Date: 2008-09-11 15:41:43+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/stock_no_autopicking/i18n/fr_FR.po b/addons/stock_no_autopicking/i18n/fr_FR.po index 5993d454c4b..6ed74038598 100644 --- a/addons/stock_no_autopicking/i18n/fr_FR.po +++ b/addons/stock_no_autopicking/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-10-28 08:55:32+0000\n" "PO-Revision-Date: 2008-10-28 08:55:32+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" diff --git a/addons/subscription/i18n/fr_FR.po b/addons/subscription/i18n/fr_FR.po index a83e30993da..a24637dd643 100644 --- a/addons/subscription/i18n/fr_FR.po +++ b/addons/subscription/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-09-05 13:23+0000\n" "PO-Revision-Date: 2008-10-13 17:01+0000\n" "Last-Translator: Olivier Laurent \n" -"Language-Team: LANGUAGE \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/addons/warning/i18n/fr_FR.po b/addons/warning/i18n/fr_FR.po index 1a1ef6eeb88..f53107a7298 100644 --- a/addons/warning/i18n/fr_FR.po +++ b/addons/warning/i18n/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2008-10-27 15:28:26+0000\n" "PO-Revision-Date: 2008-10-27 15:28:26+0000\n" "Last-Translator: <>\n" -"Language-Team: \n" +"Language-Team: OpenERP Language Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n"