fixed conflict

This commit is contained in:
Nabin Hait 2013-04-09 11:41:20 +05:30
commit fda2ab1054
2 changed files with 12 additions and 0 deletions

View File

@ -0,0 +1,11 @@
import webnotes
import webnotes.model
def execute():
for p in ["activity", "todo", "questions", "question-view"]:
pbean = webnotes.bean("Page", p)
pbean.doclist.append({
"doctype": "Page Role",
"role": "All",
"parentfield": "roles"
})
pbean.save()

View File

@ -240,4 +240,5 @@ patch_list = [
'execute:webnotes.reload_doc("selling", "Print Format", "Quotation Spartan") # 2013-04-02',
"patches.april_2013.p04_reverse_modules_list",
"execute:webnotes.delete_doc('Search Criteria', 'time_log_summary')"
"patches.april_2013.p04_update_role_in_pages",
]