CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 02:34:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12691 from frappe/codingCoffee-patch-1

Browse Source 
conflict fix
This commit is contained in:
Saurabh
2018-01-29 17:08:49 +05:30
committed by GitHub
parent 03f6b3e588 471e27559f
commit 61f85a8dbd
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/patches.txt
View File

@@ -488,9 +488,6 @@ erpnext.patches.v10_0.update_reserved_qty_for_purchase_order
erpnext.patches.v10_0.fichier_des_ecritures_comptables_for_france
erpnext.patches.v10_0.update_assessment_plan
erpnext.patches.v10_0.update_assessment_result
<<<<<<< HEAD
erpnext.patches.v10_0.added_extra_gst_custom_field
erpnext.patches.v10_0.workflow_leave_application #2018-01-24
=======
erpnext.patches.v10_0.set_default_payment_terms_based_on_company
>>>>>>> master