schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Merge Conflict

Browse Source
This commit is contained in:
marination
2022-07-27 17:30:46 +05:30
parent 89348c1bb4
commit 6fbb06a878
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/translations/fr.csv
View File

@@ -9855,12 +9855,7 @@ Stock Transactions Settings, Paramétre des transactions
Role Allowed to Over Deliver/Receive, Rôle autorisé à dépasser cette limite
Users with this role are allowed to over deliver/receive against orders above the allowance percentage,Rôle Utilisateur qui sont autorisé à livrée/commandé au-delà de la limite
Over Transfer Allowance,Autorisation de limite de transfert
<<<<<<< HEAD
"The percentage you are allowed to transfer more against the quantity ordered. For example, if you have ordered 100 units, and your Allowance is 10%, then you are allowed transfer 110 units","Le pourcentage de quantité que vous pourrez receptionné en plus de la quantité commandée"
Quality Inspection Settings,Paramétre de l&#39;inspection qualité
=======
Quality Inspection Settings,Paramétre de l'inspection qualité
>>>>>>> cc1f837685 (fix: update fr translations (#31687))
Action If Quality Inspection Is Rejected,Action si l'inspection qualité est rejetée
Disable Serial No And Batch Selector,Désactiver le sélecteur de numéro de lot/série
Is Rate Adjustment Entry (Debit Note),Est un justement du prix de la note de débit
Can't render this file because it is too large.