Merge pull request #12691 from frappe/codingCoffee-patch-1
conflict fix
This commit is contained in:
commit
61f85a8dbd
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user