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

[fix] [minor] merge conflict fixed

Browse Source
This commit is contained in:
Akhilesh Darjee
2013-09-12 14:02:37 +05:30
parent a7a06a77dd 6656acff52
commit b9c12eff17
5 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
patches/patch_list.py
View File

@@ -263,4 +263,5 @@ patch_list = [
"execute:webnotes.reload_doc('setup', 'doctype', 'features_setup') # 2013-09-05",
"patches.september_2013.p02_fix_serial_no_status",
"patches.september_2013.p03_modify_item_price_include_in_price_list",
"patches.september_2013.p03_update_stock_uom_in_sle",
]