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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Nabin Hait
2016-11-17 16:41:52 +05:30
parent 46753de6d7 d79cca3ba7
commit 652743b26e
2 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '7.1.14' __version__ = '7.1.15'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/translations/fr.csv
View File

@@ -420,7 +420,7 @@ DocType: Employee,Single,Unique
DocType: Account,Cost of Goods Sold,Coût des marchandises vendues DocType: Account,Cost of Goods Sold,Coût des marchandises vendues
DocType: Purchase Invoice,Yearly,Annuel DocType: Purchase Invoice,Yearly,Annuel
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,S'il vous plaît entrer Centre de coûts apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,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 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 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} 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}
1 DocType: Employee Salary Mode Mode de rémunération
420 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68 Avg. Selling Rate Moy. Taux de vente
421 DocType: Assessment Examiner Name Nom de l'examinateur
422 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}
423 DocType: Purchase Invoice Item Quantity and Rate Quantité et Prix
424 DocType: Delivery Note % Installed Installé%
425 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.
426 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