fixed conflict

This commit is contained in:
Nabin Hait
2013-01-25 17:42:25 +05:30
7 changed files with 26 additions and 52 deletions

View File

@@ -0,0 +1,8 @@
from __future__ import unicode_literals
def execute():
from webnotes.utils.nestedset import rebuild_tree
rebuild_tree("Item Group", "parent_item_group")
rebuild_tree("Customer Group", "parent_customer_group")
rebuild_tree("Territory", "parent_territory")
rebuild_tree("Sales Person", "parent_sales_person")

View File

@@ -159,4 +159,5 @@ patch_list = [
"patches.january_2013.remove_unwanted_permission",
"patches.january_2013.remove_landed_cost_master",
"patches.january_2013.reload_print_format",
"patches.january_2013.rebuild_tree",
]