nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 05:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2016-10-07 16:53:07 +05:30
parent cf8438d153 f69edb3fa3
commit cd9c45f816
18 changed files with 174 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/translations/fr.csv
View File

@@ -413,7 +413,7 @@ DocType: Employee,Single,Unique
DocType: Account,Cost of Goods Sold,Coût des marchandises vendues
DocType: Purchase Invoice,Yearly,Annuel
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,S'il vous plaît entrer Centre de coûts
DocType: Journal Entry Account,Sales Order,Bon de commande
DocType: Journal Entry Account,Sales Order,commande client
apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Moy. Taux de vente
DocType: Assessment,Examiner Name,Nom de l'examinateur
apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},La quantité ne peut pas être une fraction à la ligne {0}
@@ -1007,7 +1007,7 @@ apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard B
DocType: GL Entry,Against,Contre
DocType: Item,Default Selling Cost Center,Coût des marchandises vendues
DocType: Sales Partner,Implementation Partner,Partenaire de mise en œuvre
apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},Bon de commande {0} est {1}
apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},commande client {0} est {1}
DocType: Opportunity,Contact Info,Information de contact
apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Faire des entrées stock
DocType: Packing Slip,Net Weight UOM,Unité de mesure Poids Net
@@ -1152,7 +1152,7 @@ DocType: Item,Lead Time in days,Délai en jours
,Accounts Payable Summary,Le résumé des comptes à payer
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},N'êtes pas autorisé à modifier le compte gelé {0}
DocType: Journal Entry,Get Outstanding Invoices,Obtenez les factures impayées
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,Bon de commande {0} invalide
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,commande client {0} invalide
apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","Désolé , les entreprises ne peuvent pas être fusionnés"
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",La quantité Problème / transfert total {0} dans Material Request {1} \ ne peut pas être supérieure à la quantité demandée {2} pour le poste {3}
@@ -1607,7 +1607,7 @@ DocType: Authorization Control,Authorization Control,Contrôle d'autorisatio
apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Entrepôt Rejeté est obligatoire contre Item rejeté {1}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Payment,Paiement
DocType: Production Order Operation,Actual Time and Cost,Temps réel et coût
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Demande de Matériel d'un maximum de {0} peut être faite pour l'article {1} par rapport au bon de commande {2}
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Demande de Matériel d'un maximum de {0} peut être faite pour l'article {1} par rapport au commande client {2}
DocType: Employee,Salutation,Titre
DocType: Pricing Rule,Brand,Marque
DocType: Course,Course Abbreviation,Abréviation de cours
@@ -1883,7 +1883,7 @@ apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for build
DocType: Quality Inspection,In Process,En cours
DocType: Authorization Rule,Itemwise Discount,Remise (par Article)
apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Arbre des comptes financiers.
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,{0} against Sales Order {1},{0} contre le bon de commande de vente {1}
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,{0} against Sales Order {1},{0} contre le commande client de vente {1}
DocType: Account,Fixed Asset,Actifs immobilisés
apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Inventaire sérialisé
DocType: Activity Type,Default Billing Rate,Prix facturation par défaut
@@ -2182,7 +2182,7 @@ DocType: Homepage,Homepage,Page d'accueil
DocType: Purchase Receipt Item,Recd Quantity,Quantité reçue
apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},Records Fee Créé - {0}
DocType: Asset Category Account,Asset Category Account,Catégorie d'actif compte
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},Ne peut pas produire plus d'article {0} que de la qté du bon de commande {1}
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},Ne peut pas produire plus d'article {0} que de la qté du commande client {1}
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,Entrée stock {0} est pas soumis
DocType: Payment Reconciliation,Bank / Cash Account,Banque et liquidités
DocType: Tax Rule,Billing City,Ville de facturation
@@ -2532,7 +2532,7 @@ apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
DocType: Program Enrollment Tool,Get Students,Obtenez étudiants
DocType: Serial No,Under Warranty,Sous garantie
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[Erreur]
DocType: Sales Order,In Words will be visible once you save the Sales Order.,En Toutes Lettres. Sera visible une fois que vous enregistrerez le bon de commande.
DocType: Sales Order,In Words will be visible once you save the Sales Order.,En Toutes Lettres. Sera visible une fois que vous enregistrerez le commande client.
,Employee Birthday,Anniversaire de l'employé
apps/erpnext/erpnext/controllers/status_updater.py +175,Limit Crossed,Limite Crossed
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital Risque
@@ -2769,7 +2769,7 @@ apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists
apps/erpnext/erpnext/accounts/page/pos/pos.js +1190,Please select customer,S'il vous plaît sélectionner client
DocType: C-Form,I,I
DocType: Company,Asset Depreciation Cost Center,Asset Centre Amortissements
DocType: Sales Order Item,Sales Order Date,Date du bon de Commande
DocType: Sales Order Item,Sales Order Date,Date du commande client
DocType: Sales Invoice Item,Delivered Qty,Qté livrée
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Si elle est cochée, tous les enfants de chaque élément de production seront inclus dans les demandes de matériel."
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Entrepôt {0}: Société est obligatoire
@@ -3459,7 +3459,7 @@ DocType: Task,Total Expense Claim (via Expense Claim),Frais totaux (via Note de
apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,Customer Id,Client Id
apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Marquer absent
DocType: Journal Entry Account,Exchange Rate,Taux de change
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,Bon de commande {0} n'a pas été transmis
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,commande client {0} n'a pas été transmis
DocType: Homepage,Tag Line,Tag ligne
DocType: Fee Component,Fee Component,Component Fee
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Ajouter des articles de
1 DocType: Employee Salary Mode Mode de rémunération
413 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68 Avg. Selling Rate Moy. Taux de vente
414 DocType: Assessment Examiner Name Nom de l'examinateur
415 apps/erpnext/erpnext/utilities/transaction_base.py +149 Quantity cannot be a fraction in row {0} La quantité ne peut pas être une fraction à la ligne {0}
416 DocType: Purchase Invoice Item Quantity and Rate Quantité et Prix
417 DocType: Delivery Note % Installed Installé%
418 apps/erpnext/erpnext/public/js/setup_wizard.js +378 Classrooms/ Laboratories etc where lectures can be scheduled. Les salles de classe / Laboratoires etc où des conférences peuvent être programmées.
419 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46 Please enter company name first S'il vous plaît entrez en premier le nom de l'entreprise
1007 Ordered Items To Be Billed Articles commandés à facturer
1008 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39 From Range has to be less than To Range De Gamme doit être inférieure à la gamme
1009 DocType: Global Defaults Global Defaults Valeurs par défaut globales
1010 apps/erpnext/erpnext/projects/doctype/project/project.py +153 Project Collaboration Invitation Invitation de collaboration de projet
1011 DocType: Salary Slip Deductions Déductions
1012 apps/erpnext/erpnext/public/js/financial_statements.js +73 Start Year Année de début
1013 DocType: Purchase Invoice Start date of current invoice's period Date de début de la période de facturation en cours
1152 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41 Capital Equipments Capitaux immobilisés
1153 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31 Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand. Prix règle est d'abord sélectionné sur la base de «postuler en« champ, qui peut être l'article, groupe d'articles ou de marque.
1154 DocType: Hub Settings Seller Website Site Vendeur
1155 DocType: Item ITEM- ARTICLE-
1156 apps/erpnext/erpnext/controllers/selling_controller.py +147 Total allocated percentage for sales team should be 100 Pourcentage total alloué à l'équipe de vente devrait être de 100
1157 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110 Production Order status is {0} Feuilles alloué avec succès pour {0}
1158 DocType: Appraisal Goal Goal Objectif
1607 DocType: Manufacturing Settings Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order Désactive la création de registres de temps contre les ordres de fabrication. Opérations ne doivent pas être suivis contre ordre de fabrication
1608 DocType: Item Has Variants A Variantes
1609 DocType: Monthly Distribution Name of the Monthly Distribution Nom de la répartition mensuelle
1610 DocType: Sales Person Parent Sales Person Parent Sales Person
1611 apps/erpnext/erpnext/setup/utils.py +14 Please specify Default Currency in Company Master and Global Defaults S'il vous plaît spécifier la devise par défaut dans la Société principal et réglages globaux
1612 DocType: Purchase Invoice Recurring Invoice Facture récurrente
1613 apps/erpnext/erpnext/config/learn.py +268 Managing Projects Gestion de projets
1883 DocType: Production Order Operation Completed Qty Quantité complétée
1884 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121 For {0}, only debit accounts can be linked against another credit entry Pour {0}, seuls les comptes de débit peuvent être liés avec une autre entrée de crédit
1885 apps/erpnext/erpnext/stock/get_item_details.py +273 Price List {0} is disabled Liste des prix {0} est désactivée
1886 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99 Row {0}: Completed Qty cannot be more than {1} for operation {2} Row {0}: Terminé Quantité ne peut pas être plus que {1} pour le fonctionnement {2}
1887 DocType: Manufacturing Settings Allow Overtime Autoriser heures supplémentaires
1888 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197 {0} Serial Numbers required for Item {1}. You have provided {2}. {0} Numéros de Série requis pour objet {1}. Vous avez fourni {2}.
1889 DocType: Stock Reconciliation Item Current Valuation Rate Valorisation Taux actuel
2182 DocType: Budget Cost Center Centre de coûts
2183 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36 Voucher # Bon #
2184 DocType: Notification Control Purchase Order Message Achat message Ordre
2185 DocType: Tax Rule Shipping Country Pays de livraison
2186 DocType: Upload Attendance Upload HTML Télécharger HTML
2187 DocType: Employee Relieving Date Date de relève
2188 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12 Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria. Prix règle est faite pour remplacer la liste des prix / définir le pourcentage de remise, sur la base de certains critères.
2532 DocType: Asset Fully Depreciated entièrement dépréciées
2533 Stock Projected Qty Stock projeté Quantité
2534 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356 Customer {0} does not belong to project {1} S'il vous plaît définir la valeur par défaut {0} dans Société {0}
2535 DocType: Employee Attendance Tool Marked Attendance HTML Présence marquée HTML
2536 DocType: Sales Order Customer's Purchase Order Bon de commande du client
2537 apps/erpnext/erpnext/config/stock.py +107 Serial No and Batch N ° de série et lot
2538 DocType: Warranty Claim From Company De la société
2769 apps/erpnext/erpnext/accounts/doctype/account/account.py +188 Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it entrées de stock existent contre Entrepôt {0}, donc vous ne pouvez pas réaffecter ou de le modifier
2770 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +29 No students Found Aucun étudiant trouvé
2771 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55 Invoice Posting Date Date d’envois de la facture
2772 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +24 Sell Vendre
2773 DocType: Sales Invoice Rounded Total Total arrondi
2774 DocType: Product Bundle List items that form the package. Liste des articles qui composent le paquet.
2775 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26 Percentage Allocation should be equal to 100% Pourcentage d'allocation doit être égale à 100 %
3459 apps/erpnext/erpnext/public/js/setup_wizard.js +61 Your financial year begins on Date de début de la période comptable
3460 DocType: Material Request MREQ- MREQ-
3461 Asset Depreciations and Balances Asset Amortissements et soldes
3462 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319 Amount {0} {1} transferred from {2} to {3} Montant {0} {1} transféré de {2} et {3}
3463 DocType: Sales Invoice Get Advances Received Obtenez Avances et acomptes reçus
3464 DocType: Email Digest Add/Remove Recipients Ajouter / supprimer des destinataires
3465 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432 Transaction not allowed against stopped Production Order {0} Transaction non autorisée contre l'ordre d'arret de production {0}