Fixed conflict while merging with master

2012-05-01 11:51:08 +05:30
parent 2ade43a647 d58da50f50
commit 926f46f04a
10 changed files with 45 additions and 14 deletions
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -307,5 +307,10 @@ patch_list = [
 		'patch_file': 'serial_no_fixes',
 		'description': 'fixes for sle creation while import'
 	},
+	{
+		'patch_module': 'patches.april_2012',
+		'patch_file': 'repost_stock_for_posting_time',
+		'description': 'repost stock for posting time 00:00:seconds'
+	},

 ]