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

Fixed conflict

Browse Source
This commit is contained in:
Nabin Hait
2017-04-25 17:27:53 +05:30
parent f26dcbc1a6
commit b6a8920489
6 changed files with 63 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/patches.txt
View File

@@ -379,7 +379,6 @@ erpnext.patches.v7_2.rename_att_date_attendance
erpnext.patches.v7_2.update_attendance_docstatus
erpnext.patches.v7_2.move_dates_from_salary_structure_to_employee
erpnext.patches.v7_2.make_all_assessment_group
erpnext.patches.v8_0.manufacturer_childtable_migrate
erpnext.patches.v8_0.repost_reserved_qty_for_multiple_sales_uom
erpnext.patches.v8_0.addresses_linked_to_lead
execute:frappe.delete_doc('DocType', 'Purchase Common')
@@ -390,3 +389,4 @@ erpnext.patches.v8_0.set_null_to_serial_nos_for_disabled_sales_invoices
erpnext.patches.v8_0.enable_booking_asset_depreciation_automatically
erpnext.patches.v8_0.set_project_copied_from
erpnext.patches.v8_0.update_status_as_paid_for_completed_expense_claim
erpnext.patches.v7_2.stock_uom_in_selling