Fixed merge conflict

This commit is contained in:
Nabin Hait
2018-02-12 15:59:55 +05:30
15 changed files with 443 additions and 181 deletions

View File

@@ -493,3 +493,4 @@ erpnext.patches.v10_0.workflow_leave_application #2018-01-24
erpnext.patches.v10_0.set_default_payment_terms_based_on_company
erpnext.patches.v10_0.update_sales_order_link_to_purchase_order
erpnext.patches.v10_0.added_extra_gst_custom_field_in_gstr2
erpnext.patches.v10_0.item_barcode_childtable_migrate