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

This commit is contained in:
Anand Doshi
2012-02-09 12:48:13 +05:30
5 changed files with 24 additions and 5 deletions

View File

@@ -0,0 +1,10 @@
import patches.jan_mar_2012.website.login
import patches.jan_mar_2012.website.feed
import patches.jan_mar_2012.website.website
import patches.jan_mar_2012.website.cleanups
def execute():
patches.jan_mar_2012.website.login.execute()
patches.jan_mar_2012.website.feed.execute()
patches.jan_mar_2012.website.website.execute()
patches.jan_mar_2012.website.cleanups.execute()

View File

@@ -12,10 +12,6 @@ def execute():
# cleanup control panel
delete_doc("DocType", "Control Panel")
reload_doc("core", "doctype", "control_panel")
# cleanup page
delete_doc("DocType", "Page")
reload_doc("core", "doctype", "page")
webnotes.conn.sql("""delete from tabSingles
where field like 'startup_%' and doctype='Control Panel'""")

View File

@@ -8,6 +8,10 @@ def execute():
from webnotes.modules import reload_doc
from webnotes.model import delete_doc
# cleanup page
delete_doc("DocType", "Page")
reload_doc("core", "doctype", "page")
reload_doc('setup', 'doctype', 'item_group')
delete_doc('Website', 'Module Def', 'Website')
reload_doc('website', 'Module Def', 'Website')
@@ -23,7 +27,6 @@ def execute():
reload_doc('website', 'doctype', 'about_us_settings')
reload_doc('website', 'doctype', 'about_us_team')
reload_doc('website', 'doctype', 'blog')
reload_doc('website', 'doctype', 'blog_subscriber')
reload_doc('website', 'doctype', 'contact_us_settings')
reload_doc('website', 'doctype', 'product')
reload_doc('website', 'doctype', 'product_group')