Merge branch 'edge' of github.com:webnotes/erpnext into edge

This commit is contained in:
Rushabh Mehta
2013-01-02 16:43:18 +05:30
4 changed files with 32 additions and 46 deletions

View File

@@ -346,10 +346,6 @@ patch_list = [
'patch_module': 'patches.september_2012',
'patch_file': 'communication_delete_permission',
},
{
'patch_module': 'patches.september_2012',
'patch_file': 'reload_criteria_stock_ledger',
},
{
'patch_module': 'patches.september_2012',
'patch_file': 'all_permissions_patch',
@@ -430,10 +426,6 @@ patch_list = [
'patch_module': 'patches.november_2012',
'patch_file': 'custom_field_insert_after',
},
{
'patch_module': 'patches.november_2012',
'patch_file': 'reload_stock_ledger_report',
},
{
'patch_module': 'patches.november_2012',
'patch_file': 'delete_item_sales_register1',