merge

fr_FR.csv

@@ -3,6 +3,7 @@ error,account.invoice,0,You can not delete invoices that comes from a purchase!,
 error,purchase.line,0,"It miss an ""account_expense"" default property!","Il manque une propriété""account_expense""",0
 error,purchase.line,0,The supplier location is required!,L'emplacement fournisseur est requis !,0
 error,purchase.purchase,0,Contact and Invoice addresses must be defined for the quotation.,Les adresses de contact et de facture doivent être définie pour le devis.,0
+error,purchase.purchase,0,Invoice addresses must be defined for the quotation.,L'adresse de facturation doit être définie pour le devis.,0
 field,"product.template,product_suppliers",0,Suppliers,Fournisseurs,0
 field,"product.template,purchasable",0,Purchasable,Achetable,0
 field,"product.template,purchase_uom",0,Purchase UOM,UDM à l'achat,0
@@ -64,7 +65,12 @@ field,"purchase.purchase,total_amount",0,Total,Total,0
 field,"purchase.purchase,untaxed_amount",0,Untaxed,Non-taxé,0
 field,"purchase.purchase,warehouse",0,Warehouse,Entrepôt,0
 field,"stock.move,purchase",0,Purchase,Achats,0
-field,"stock.move,purchase_line",0,unknown,,0
+field,"stock.move,purchase_currency",0,Purchase Currency,Devise de l'achat,0
+field,"stock.move,purchase_line",0,unknown,inconnu,0
+field,"stock.move,purchase_quantity",0,Purchase Quantity,Quantité d'achat,0
+field,"stock.move,purchase_unit",0,Purchase Unit,Unité d'achat,0
+field,"stock.move,purchase_unit_digits",0,Purchase Unit Digits,Décimales de l'unité d'achat,0
+field,"stock.move,purchase_unit_price",0,Purchase Unit Price,Prix unitaire d'achat,0
 field,"stock.move,supplier",0,Supplier,Fournisseur,0
 help,"purchase.product_supplier,delivery_time",0,In number of days,En nombre de jours,0
 help,"purchase.product_supplier.price,quantity",0,Minimal quantity,Quantité minimale,0
@@ -74,12 +80,36 @@ model,"ir.action,name",report_purchase,Purchase,Achat,0
 model,"ir.action,name",act_purchase_form,Purchases,Achats,0
 model,"ir.action,name",act_purchase_form_quotation,Purchases in Quotation,Devis,0
 model,"ir.action,name",act_open_supplier,Suppliers,Fournisseurs,0
+model,"ir.sequence,name",sequence_purchase,Purchase,Achat,0
+model,"ir.sequence.type,name",sequence_type_purchase,Purchase,Achat,0
 model,"ir.ui.menu,name",menu_purchase_form_confirmed,Confirmed Purchases,Achats confirmé,0
 model,"ir.ui.menu,name",menu_purchase_form_draft,Draft Purchases,Achats brouillons,0
 model,"ir.ui.menu,name",menu_purchase,Purchase Management,Gestion des achats,0
 model,"ir.ui.menu,name",menu_purchase_form,Purchases,Achats,0
 model,"ir.ui.menu,name",menu_purchase_form_quotation,Purchases in Quotation,Devis,0
 model,"ir.ui.menu,name",menu_supplier,Suppliers,Fournisseurs,0
+model,"res.group,name",group_purchase,Purchase,Achat,0
+model,"workflow.activity,name",purchase_activity_cancel,Cancel,Annulé,0
+model,"workflow.activity,name",purchase_activity_confirmed,Confirmed,Confirmé,0
+model,"workflow.activity,name",purchase_activity_done,Done,Fait,0
+model,"workflow.activity,name",purchase_activity_draft,Draft,Brouillon,0
+model,"workflow.activity,name",purchase_activity_invoice_purchase,Invoice,Facture,0
+model,"workflow.activity,name",purchase_activity_invoice_done,Invoice Done,Facture faite,0
+model,"workflow.activity,name",purchase_activity_invoice_purchase_exception,Invoice Exception,Facture en exception,0
+model,"workflow.activity,name",purchase_activity_invoice_method,Invoice Method,Méthode de facturation,0
+model,"workflow.activity,name",purchase_activity_invoice_method_done,Invoice Method Done,Méthode de facturation faite,0
+model,"workflow.activity,name",purchase_activity_invoice_packing,Invoice Packing,Facture colisage,0
+model,"workflow.activity,name",purchase_activity_invoice_packing_done,Invoice Packing Done,Facture Colisage fait,0
+model,"workflow.activity,name",purchase_activity_invoice_packing_exception,Invoice Packing Exception,Facture colisage en exception,0
+model,"workflow.activity,name",purchase_activity_invoice_packing_method,Invoice Packing Method,Méthode facture colisage,0
+model,"workflow.activity,name",purchase_activity_invoice_packing_method_done,Invoice Packing Method Done,Méthode facture colisage fait,0
+model,"workflow.activity,name",purchase_activity_packing,Packing,Colisage,0
+model,"workflow.activity,name",purchase_activity_packing_exception,Packing Exception,Colisage en exception,0
+model,"workflow.activity,name",purchase_activity_quotation,Quotation,Devis,0
+model,"workflow.activity,name",purchase_activity_waiting_invoice_purchase,Waiting Invoice,Facture en attente,0
+model,"workflow.activity,name",purchase_activity_waiting_invoice_packing,Waiting Invoice Packing,Facture colisage en attente,0
+model,"workflow.activity,name",purchase_activity_waiting_packing,Waiting Packing,Colisage en attente,0
+model,"workflow,name",purchase_workflow,Purchase workflow,Workflow d'achat,0
 odt,purchase.purchase,0,Amount,Montant,0
 odt,purchase.purchase,0,Date:,Date:,0
 odt,purchase.purchase,0,Description,Description,0
@@ -115,8 +145,9 @@ selection,"purchase.purchase,state",0,Confirmed,Confirmé,0
 selection,"purchase.purchase,state",0,Done,Fait,0
 selection,"purchase.purchase,state",0,Draft,Brouillon,0
 selection,"purchase.purchase,state",0,Quotation,Devis,0
-view,product.product,0,Products,Produits,0
+view,product.product,0,Product Suppliers,Fournisseurs,0
 view,product.product,0,Suppliers,Fournisseurs,0
+view,purchase.line,0,Products,Produits,0
 view,purchase.line,0,Purchase Line,Ligne d'achat,0
 view,purchase.line,0,Purchase Lines,Lignes d'achat,0
 view,purchase.product_supplier,0,Product Supplier,Fournisseur du produit,0