nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 19:19:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[merge] [minor] Fixed conflict while merging serial_no branch with master

Browse Source
This commit is contained in:
Nabin Hait
2013-08-19 16:26:13 +05:30
parent c46d044efe 61e54d4d92
commit 76273ebfbc
32 changed files with 795 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patches/patch_list.py
View File

@@ -22,7 +22,6 @@ patch_list = [
"patches.april_2012.update_role_in_address",
"patches.april_2012.update_permlevel_in_address",
"patches.april_2012.update_appraisal_permission",
"patches.april_2012.serial_no_fixes",
"patches.april_2012.repost_stock_for_posting_time",
"patches.may_2012.cleanup_property_setter",
"patches.may_2012.rename_prev_doctype",
@@ -254,6 +253,7 @@ patch_list = [
"patches.august_2013.p01_hr_settings",
"patches.august_2013.p02_rename_price_list",
"patches.august_2013.p03_pos_setting_replace_customer_account",
"patches.august_2013.p05_update_serial_no_status",
"patches.august_2013.p05_employee_birthdays",
"execute:webnotes.reload_doc('accounts', 'Print Format', 'POS Invoice') # 2013-08-16",
]