Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Anand Doshi 2012-02-09 12:48:13 +05:30
commit dae6e1e6a2
5 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/patches/jan_mar_2012/website/__init__.py
View File

@ -0,0 +1,2 @@

10
erpnext/patches/jan_mar_2012/website/all.py Normal file
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()

4
erpnext/patches/jan_mar_2012/website/cleanups.py
View File

@ -12,10 +12,6 @@ def execute():
# cleanup control panel # cleanup control panel
delete_doc("DocType", "Control Panel") delete_doc("DocType", "Control Panel")
reload_doc("core", "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 webnotes.conn.sql("""delete from tabSingles
where field like 'startup_%' and doctype='Control Panel'""") where field like 'startup_%' and doctype='Control Panel'""")

5
erpnext/patches/jan_mar_2012/website/website.py
View File

@ -8,6 +8,10 @@ def execute():
from webnotes.modules import reload_doc from webnotes.modules import reload_doc
from webnotes.model import delete_doc from webnotes.model import delete_doc
# cleanup page
delete_doc("DocType", "Page")
reload_doc("core", "doctype", "page")
reload_doc('setup', 'doctype', 'item_group') reload_doc('setup', 'doctype', 'item_group')
delete_doc('Website', 'Module Def', 'Website') delete_doc('Website', 'Module Def', 'Website')
reload_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_settings')
reload_doc('website', 'doctype', 'about_us_team') reload_doc('website', 'doctype', 'about_us_team')
reload_doc('website', 'doctype', 'blog') reload_doc('website', 'doctype', 'blog')
reload_doc('website', 'doctype', 'blog_subscriber')
reload_doc('website', 'doctype', 'contact_us_settings') reload_doc('website', 'doctype', 'contact_us_settings')
reload_doc('website', 'doctype', 'product') reload_doc('website', 'doctype', 'product')
reload_doc('website', 'doctype', 'product_group') reload_doc('website', 'doctype', 'product_group')

8
wnf.py
View File

@ -54,6 +54,8 @@ def setup_options():
help="reload doc") help="reload doc")
parser.add_option('--export_doc', nargs=2, metavar = "doctype docname", parser.add_option('--export_doc', nargs=2, metavar = "doctype docname",
help="export doc") help="export doc")
parser.add_option('--install', nargs=3, metavar = "rootpassword dbname source",
help="install fresh db")
return parser.parse_args() return parser.parse_args()
@ -132,6 +134,12 @@ def run():
webnotes.modules.patch_handler.run_all() webnotes.modules.patch_handler.run_all()
print '\n'.join(webnotes.modules.patch_handler.log_list) print '\n'.join(webnotes.modules.patch_handler.log_list)
elif options.install:
from webnotes.install_lib.install import Installer
inst = Installer('root', options.install[0])
inst.import_from_db(options.install[1], source_path=options.install[2], \
password='admin', verbose = 1)
# print messages # print messages
if webnotes.message_log: if webnotes.message_log:
print '\n'.join(webnotes.message_log) print '\n'.join(webnotes.message_log)