minor fixes

This commit is contained in:
Nabin Hait 2015-02-18 11:55:50 +05:30
parent 221e6f2fae
commit aca7b3497e
4 changed files with 7 additions and 7 deletions

View file

@ -217,7 +217,7 @@ def add_module_defs(app):
d.save()
def remove_missing_apps():
apps = ('frappe_subscription',)
apps = ('frappe_subscription', 'shopping_cart')
installed_apps = frappe.get_installed_apps()
for app in apps:
if app in installed_apps:

View file

@ -25,7 +25,9 @@ def rename_doc(doctype, old, new, force=False, merge=False, ignore_permissions=F
old_doc = frappe.get_doc(doctype, old)
out = old_doc.run_method("before_rename", old, new, merge) or {}
new = (out.get("new") or new) if isinstance(out, dict) else (out or new)
new = validate_rename(doctype, new, meta, merge, force, ignore_permissions)
if doctype != "DocType":
new = validate_rename(doctype, new, meta, merge, force, ignore_permissions)
if not merge:
rename_parent_and_child(doctype, old, new, meta)

View file

@ -10,7 +10,7 @@ def execute():
# every user must have access to his / her own detail
for user in frappe.get_all("User", filters={"user_type": "System User"}):
frappe.share.add("User", user.name, user.name, write=1)
frappe.share.add("User", user.name, user.name, share=1)
# move event user to shared
if frappe.db.exists("DocType", "Event User"):

View file

@ -2,12 +2,10 @@ import frappe
def execute():
changed = (
("desk", ("feed", "event", "event_role", "event_user", "todo",
"note", "note_user")),
("desk", ("feed", "event", "event_role", "todo", "note")),
("custom", ("custom_field", "custom_script", "customize_form",
"customize_form_field", "property_setter")),
("email", ("bulk_email", "email_alert", "email_alert_recipient",
"standard_reply")),
("email", ("bulk_email", "email_alert", "email_alert_recipient", "standard_reply")),
("geo", ("country", "currency")),
("print", ("letter_head", "print_format", "print_settings"))
)