Merge branch 'master' of github.com:webnotes/erpnext

Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2012-11-27 18:56:32 +05:30
15 changed files with 317 additions and 254 deletions

View File

@@ -687,4 +687,8 @@ patch_list = [
'patch_module': 'patches.november_2012',
'patch_file': 'cancelled_bom_patch',
},
{
'patch_module': 'patches.november_2012',
'patch_file': 'communication_sender_and_recipient',
},
]