\
\
\
\
@@ -669,15 +686,16 @@ if(this.show_filters){this.make_filters();}},add_button:function(label,click,ico
if(icon){$('').addClass(icon).appendTo($button);}
$button.html(label).click(click);return $button}},show_view:function($btn,$div,$btn_unsel,$div_unsel){$btn_unsel.removeClass('btn-info');$btn_unsel.find('i').removeClass('icon-white');$div_unsel.toggle(false);$btn.addClass('btn-info');$btn.find('i').addClass('icon-white');$div.toggle(true);},set_events:function(){var me=this;this.$w.find('.btn-more').click(function(){me.run({append:true});});if(this.title){this.$w.find('h3').html(this.title).toggle(true);}
if(!(this.hide_refresh||this.no_refresh)){this.add_button('Refresh',function(){me.run();},'icon-refresh');}
-if(this.new_doctype){this.add_button('New '+this.new_doctype,function(){newdoc(me.new_doctype)},'icon-plus');}
-if(me.show_filters){this.add_button('Show Filters',function(){me.filter_list.show_filters();},'icon-search').addClass('btn-filter');}},make_filters:function(){this.filter_list=new wn.ui.FilterList({listobj:this,$parent:this.$w.find('.list-filters').toggle(true),doctype:this.doctype,filter_fields:this.filter_fields});},clear:function(){this.data=[];this.$w.find('.result-list').empty();this.$w.find('.result').toggle(true);this.$w.find('.no-result').toggle(false);this.start=0;},run:function(){var me=this;var a0=arguments[0];var a1=arguments[1];if(a0&&typeof a0=='function')
+if(this.new_doctype){this.add_button('New '+this.new_doctype,function(){wn.views.formview.create(me.new_doctype)},'icon-plus');}
+if(me.show_filters){this.add_button('Show Filters',function(){me.filter_list.show_filters();},'icon-search').addClass('btn-filter');}
+if(me.no_toolbar||me.hide_toolbar){me.$w.find('.list-toolbar-wrapper').toggle(false);}},make_filters:function(){this.filter_list=new wn.ui.FilterList({listobj:this,$parent:this.$w.find('.list-filters').toggle(true),doctype:this.doctype,filter_fields:this.filter_fields});},clear:function(){this.data=[];this.$w.find('.result-list').empty();this.$w.find('.result').toggle(true);this.$w.find('.no-result').toggle(false);this.start=0;},run:function(){var me=this;var a0=arguments[0];var a1=arguments[1];if(a0&&typeof a0=='function')
this.onrun=a0;if(a0&&a0.callback)
this.onrun=a0.callback;if(!a1&&!(a0&&a0.append))
-this.start=0;me.set_working(true);wn.call({method:this.opts.method||'webnotes.widgets.query_builder.runquery',args:this.get_call_args(),callback:function(r){me.set_working(false);me.render_results(r)},no_spinner:this.opts.no_loading});},set_working:function(flag){this.$w.find('.img-load').toggle(flag);},get_call_args:function(){if(!this.method){this.query=this.get_query?this.get_query():this.query;this.add_limits();var args={query_max:this.query_max,as_dict:1}
+this.start=0;me.set_working(true);wn.call({method:this.opts.method||'webnotes.widgets.query_builder.runquery',args:this.get_call_args(a0),callback:function(r){me.set_working(false);me.render_results(r)},no_spinner:this.opts.no_loading});},set_working:function(flag){this.$w.find('.img-load').toggle(flag);},get_call_args:function(opts){if(!this.method){this.query=this.get_query?this.get_query():this.query;this.add_limits();var args={query_max:this.query_max,as_dict:1}
args.simple_query=this.query;}else{var args={limit_start:this.start,limit_page_length:this.page_length}}
if(this.args)
$.extend(args,this.args)
-if(this.get_args){$.extend(args,this.get_args());}
+if(this.get_args){$.extend(args,this.get_args(opts));}
return args;},render_results:function(r){if(this.start==0)this.clear();this.$w.find('.btn-more').toggle(false);if(r.message)r.values=r.message;if(r.values&&r.values.length){this.data=this.data.concat(r.values);this.render_list(r.values);}else{if(this.start==0){this.$w.find('.result').toggle(false);this.$w.find('.no-result').toggle(true);}}
if(this.onrun)this.onrun();if(this.callback)this.callback(r);},render_list:function(values){var m=Math.min(values.length,this.page_length);for(var i=0;i=this.page_length)
@@ -737,7 +755,7 @@ function loadreport(dt,rep_name,onload){if(rep_name)
wn.set_route('Report',dt,rep_name);else
wn.set_route('Report',dt);}
function loaddoc(doctype,name,onload){wn.model.with_doctype(doctype,function(){if(locals.DocType[doctype].in_dialog){_f.edit_record(doctype,name);}else{wn.set_route('Form',doctype,name);}})}
-var load_doc=loaddoc;function new_doc(doctype,onload,in_dialog,on_save_callback,cdt,cdn,cnic){doctype=get_label_doctype(doctype);wn.model.with_doctype(doctype,function(){if(locals.DocType[doctype].in_dialog){_f.edit_record(doctype,'New '+doctype);}else{wn.set_route('Form',doctype,'New '+doctype);}})}
+var load_doc=loaddoc;function new_doc(doctype,onload,in_dialog,on_save_callback,cdt,cdn,cnic){doctype=get_label_doctype(doctype);wn.model.with_doctype(doctype,function(){if(locals.DocType[doctype].in_dialog){var new_name=LocalDB.create(doctype);_f.edit_record(doctype,new_name);}else{wn.views.formview.create(doctype);}})}
var newdoc=new_doc;var pscript={};function loadpage(page_name,call_back,no_history){wn.set_route(page_name);}
function loaddocbrowser(dt){wn.set_route('List',dt);}
/*
@@ -797,14 +815,8 @@ var Meta={};var local_dt={};Meta.make_local_dt=function(dt,dn){var dl=make_docli
Meta.get_field=function(dt,fn,dn){if(dn&&local_dt[dt]&&local_dt[dt][dn]){return local_dt[dt][dn][fn];}else{if(fields[dt])var d=fields[dt][fn];if(d)return d;}
return{};}
Meta.set_field_property=function(fn,key,val,doc){if(!doc&&(cur_frm.doc))doc=cur_frm.doc;try{local_dt[doc.doctype][doc.name][fn][key]=val;refresh_field(fn);}catch(e){alert("Client Script Error: Unknown values for "+doc.name+','+fn+'.'+key+'='+val);}}
-function get_doctype_label(dt){if(session.dt_labels&&session.dt_labels[dt])
-return session.dt_labels[dt]
-else
-return dt}
-function get_label_doctype(label){if(session.rev_dt_labels&&session.rev_dt_labels[label])
-return session.rev_dt_labels[label]
-else
-return label}
+function get_doctype_label(dt){return dt}
+function get_label_doctype(label){return label}
var getchildren=LocalDB.getchildren;var get_field=Meta.get_field;var createLocal=LocalDB.create;
/*
* lib/js/legacy/model/doclist.js
@@ -818,8 +830,10 @@ function expand_doclist(docs){var l=[];for(var i=0;iMandatory fields required in '+
(doc.parenttype?(fields[doc.parenttype][doc.parentfield].label+' (Table)'):get_doctype_label(doc.doctype))+':\n'+errfld.join('\n'));return all_clear;}
/*
- * lib/js/legacy/app.js
+ * lib/js/wn/app.js
*/
-var popup_cont;var session={};if(!wn)var wn={};function startup(){popup_cont=$a(document.getElementsByTagName('body')[0],'div');var setup_globals=function(r){wn.boot=r;profile=r.profile;user=r.profile.name;user_fullname=wn.user_info(user).fullname;user_defaults=profile.defaults;user_roles=profile.roles;user_email=profile.email;home_page=r.home_page;_p.letter_heads=r.letter_heads;sys_defaults=r.sysdefaults;session.rt=profile.can_read;if(r.ipinfo)session.ipinfo=r.ipinfo;session.dt_labels=r.dt_labels;session.rev_dt_labels={}
-if(r.dt_labels){for(key in r.dt_labels)session.rev_dt_labels[r.dt_labels[key]]=key;}
-wn.control_panel=r.control_panel;}
-var setup_viewport=function(){wn.container=new wn.views.Container();if(user=='Guest')
-user_defaults.hide_webnotes_toolbar=1;if(!cint(user_defaults.hide_webnotes_toolbar)||user=='Administrator'){wn.container.wntoolbar=new wn.ui.toolbar.Toolbar();}
-$(document).trigger('startup');try{if(wn.control_panel.custom_startup_code)
-eval(wn.control_panel.custom_startup_code);}catch(e){errprint(e);}
-var t=to_open();if(t){window.location.hash=t;set_favicon();}else if(home_page){loadpage(home_page);}
-wn.route();$dh('startup_div');$ds('body_div');}
-var callback=function(r,rt){if(r.exc)console.log(r.exc);setup_globals(r);setup_viewport();}
-if(wn.boot){LocalDB.sync(wn.boot.docs);callback(wn.boot,'');if(wn.boot.error_messages)
+wn.Application=Class.extend({init:function(){this.load_bootinfo();this.make_page_container();this.make_nav_bar();this.set_favicon();$(document).trigger('startup');wn.route();},load_bootinfo:function(){LocalDB.sync(wn.boot.docs);wn.user=wn.boot.profile.name;wn.control_panel=wn.boot.control_panel;if(wn.boot.error_messages)
console.log(wn.boot.error_messages)
if(wn.boot.server_messages)
-msgprint(wn.boot.server_messages);}else{if($i('startup_div'))
-$c('startup',{},callback,null,1);}}
-function to_open(){if(get_url_arg('page'))
-return get_url_arg('page');var h=location.hash;if(h){return h.substr(1);}}
-function logout(){$c('logout',args={},function(r,rt){if(r.exc){msgprint(r.exc);return;}
-redirect_to_login();});}
-function redirect_to_login(){if(login_file)
-window.location.href=login_file;else{window.location.reload();}}
-_p.def_print_style_body="html, body, div, span, td { font-family: Arial, Helvetica; font-size: 12px; }"+"\npre { margin:0; padding:0;}"
-_p.def_print_style_other="\n.simpletable, .noborder { border-collapse: collapse; margin-bottom: 10px;}"
-+"\n.simpletable td {border: 1pt solid #000; vertical-align: top; padding: 2px; }"
-+"\n.noborder td { vertical-align: top; }"
-_p.go=function(html){var d=document.createElement('div')
-d.innerHTML=html
-$(d).printElement();}
-_p.preview=function(html){var w=window.open('');w.document.write(html)
-w.document.close();}
-var resize_observers=[]
-function set_resize_observer(fn){if(resize_observers.indexOf(fn)==-1)resize_observers.push(fn);}
-window.onresize=function(){return;var ht=get_window_height();for(var i=0;i \
- '
-$(favicon).appendTo('head');}
+msgprint(wn.boot.server_messages);this.set_globals();},set_globals:function(){profile=wn.boot.profile;user=wn.boot.profile.name;user_fullname=wn.user_info(user).fullname;user_defaults=profile.defaults;user_roles=profile.roles;user_email=profile.email;sys_defaults=wn.boot.sysdefaults;},make_page_container:function(){wn.container=new wn.views.Container();wn.views.make_403();wn.views.make_404();$('#startup_div').toggle(false);$('#body_div').toggle(true);},make_nav_bar:function(){if(wn.user!='Guest'){wn.container.wntoolbar=new wn.ui.toolbar.Toolbar();}},logout:function(){var me=this;wn.call({method:'logout',callback:function(r){if(r.exc){console.log(r.exc);return;}
+me.redirect_to_login();}})},redirect_to_login:function(){window.location.hash='';window.location.reload();},set_favicon:function(){var link=$('link[type="image/x-icon"]').remove().attr("href");var favicon='\
+ \
+ '
+$(favicon).appendTo('head');}})
/*
* js/app.js
*/
wn.app={name:'ERPNext',license:'GNU/GPL - Usage Condition: All "erpnext" branding must be kept as it is',source:'https://github.com/webnotes/erpnext',publisher:'Web Notes Technologies Pvt Ltd, Mumbai',copyright:'© Web Notes Technologies Pvt Ltd',version:'2.'+window._version_number}
-wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',function(){startup();});$(document).bind('toolbar_setup',function(){$('.brand').html('erpnext\
+wn.modules_path='erpnext';$(document).bind('toolbar_setup',function(){$('.brand').html('erpnext\
').hover(function(){$(this).find('.icon-home').addClass('navbar-icon-home-hover');},function(){$(this).find('.icon-home').removeClass('navbar-icon-home-hover');});});
/*
* erpnext/startup/startup.js
*/
var current_module;var is_system_manager=0;wn.provide('erpnext.startup');erpnext.modules={'Selling':'selling-home','Accounts':'accounts-home','Stock':'stock-home','Buying':'buying-home','Support':'support-home','Projects':'projects-home','Production':'production-home','Website':'website-home','HR':'hr-home','Setup':'Setup','Activity':'activity','To Do':'todo','Calendar':'calendar','Messages':'messages','Knowledge Base':'questions','Dashboard':'dashboard'}
-erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_panel.sync_with_gateway)
+erpnext.startup.set_globals=function(){wn.control_panel.sync_with_gateway=wn.boot.sync_with_gateway
+pscript.is_erpnext_saas=cint(wn.control_panel.sync_with_gateway)
if(inList(user_roles,'System Manager'))is_system_manager=1;}
erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);}
if(user=='Guest'){if(wn.boot.custom_css){set_style(wn.boot.custom_css);}
diff --git a/js/app.js b/js/app.js
index 6555de0c9cf..e0716ececa4 100644
--- a/js/app.js
+++ b/js/app.js
@@ -1,19 +1,3 @@
-// ERPNext - web based ERP (http://erpnext.com)
-// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see .
-
wn.app = {
name: 'ERPNext',
license: 'GNU/GPL - Usage Condition: All "erpnext" branding must be kept as it is',
@@ -24,11 +8,6 @@ wn.app = {
}
wn.modules_path = 'erpnext';
-wn.settings.no_history = true;
-
-$(document).bind('ready', function() {
- startup();
-});
$(document).bind('toolbar_setup', function() {
$('.brand').html('erpnext\
diff --git a/version.num b/version.num
deleted file mode 100644
index 1291917b26e..00000000000
--- a/version.num
+++ /dev/null
@@ -1 +0,0 @@
-1694
\ No newline at end of file
diff --git a/wnf.py b/wnf.py
deleted file mode 100755
index 94450d8e745..00000000000
--- a/wnf.py
+++ /dev/null
@@ -1,256 +0,0 @@
-#!/usr/bin/env python
-
-# ERPNext - web based ERP (http://erpnext.com)
-# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-import os, sys
-
-def replace_code(start, txt1, txt2, extn, search=None):
- """replace all txt1 by txt2 in files with extension (extn)"""
- import webnotes.utils
- import os, re
- esc = webnotes.utils.make_esc('[]')
- if not search: search = esc(txt1)
- for wt in os.walk(start, followlinks=1):
- for fn in wt[2]:
- if fn.split('.')[-1]==extn:
- fpath = os.path.join(wt[0], fn)
- if fpath != '/var/www/erpnext/erpnext/patches/jan_mar_2012/rename_dt.py': # temporary
- with open(fpath, 'r') as f:
- content = f.read()
-
- if re.search(search, content):
- res = search_replace_with_prompt(fpath, txt1, txt2)
- if res == 'skip':
- return 'skip'
-
-
-
-def search_replace_with_prompt(fpath, txt1, txt2):
- """ Search and replace all txt1 by txt2 in the file with confirmation"""
-
- from termcolor import colored
- with open(fpath, 'r') as f:
- content = f.readlines()
-
- tmp = []
- for c in content:
- if c.find(txt1) != -1:
- print '\n', fpath
- print colored(txt1, 'red').join(c[:-1].split(txt1))
- a = ''
- while a.lower() not in ['y', 'n', 'skip']:
- a = raw_input('Do you want to Change [y/n/skip]?')
- if a.lower() == 'y':
- c = c.replace(txt1, txt2)
- elif a.lower() == 'skip':
- return 'skip'
- tmp.append(c)
-
- with open(fpath, 'w') as f:
- f.write(''.join(tmp))
- print colored('Updated', 'green')
-
-
-def setup_options():
- from optparse import OptionParser
- parser = OptionParser()
-
- parser.add_option("-d", "--db",
- dest="db_name",
- help="Apply the patches on given db")
-
- # build
- parser.add_option("-b", "--build", default=False, action="store_true",
- help="minify + concat js files")
- parser.add_option("-c", "--clear", default=False, action="store_true",
- help="increment version")
-
- # git
- parser.add_option("--status", default=False, action="store_true",
- help="git status")
- parser.add_option("--pull", nargs=2, default=False,
- metavar = "remote branch",
- help="git pull (both repos)")
- parser.add_option("--push", nargs=3, default=False,
- metavar = "remote branch comment",
- help="git commit + push (both repos) [remote] [branch] [comment]")
- parser.add_option("-l", "--latest",
- action="store_true", dest="run_latest", default=False,
- help="Apply the latest patches")
-
- # patch
- parser.add_option("-p", "--patch", nargs=1, dest="patch_list", metavar='patch_module',
- action="append",
- help="Apply patch")
- parser.add_option("-f", "--force",
- action="store_true", dest="force", default=False,
- help="Force Apply all patches specified using option -p or --patch")
- parser.add_option('--reload_doc', nargs=3, metavar = "module doctype docname",
- help="reload doc")
- parser.add_option('--export_doc', nargs=2, metavar = "doctype docname",
- help="export doc")
-
- # install
- parser.add_option('--install', nargs=3, metavar = "rootpassword dbname source",
- help="install fresh db")
-
- # diff
- parser.add_option('--diff_ref_file', nargs=0, \
- help="Get missing database records and mismatch properties, with file as reference")
- parser.add_option('--diff_ref_db', nargs=0, \
- help="Get missing .txt files and mismatch properties, with database as reference")
-
- # scheduler
- parser.add_option('--run_scheduler', default=False, action="store_true",
- help="Trigger scheduler")
- parser.add_option('--run_scheduler_event', nargs=1, metavar="[all|daily|weekly|monthly]",
- help="Run scheduler event")
-
- # misc
- parser.add_option("--replace", nargs=3, default=False,
- metavar = "search replace_by extension",
- help="file search-replace")
-
- parser.add_option("--cci", nargs=1, metavar="CacheItem Key or all",
- help="Clear Cache Item")
-
- parser.add_option("--sync_all", help="Synchronize all DocTypes using txt files",
- nargs=0)
-
- parser.add_option("--sync", help="Synchronize given DocType using txt file",
- nargs=2, metavar="module doctype (use their folder names)")
-
- return parser.parse_args()
-
-def run():
- sys.path.append('lib')
- sys.path.append('lib/py')
- import webnotes
- import webnotes.defs
- sys.path.append(webnotes.defs.modules_path)
-
- (options, args) = setup_options()
-
-
- from webnotes.db import Database
- import webnotes.modules.patch_handler
-
- # connect
- if options.db_name is not None:
- webnotes.connect(options.db_name)
-
- # build
- if options.build:
- import build.project
- build.project.build()
-
- elif options.clear:
- from build.project import increment_version
- print "Version:" + str(increment_version())
-
- # code replace
- elif options.replace:
- replace_code('.', options.replace[0], options.replace[1], options.replace[2])
-
- # git
- elif options.status:
- os.system('git status')
- os.chdir('lib')
- os.system('git status')
-
- elif options.pull:
- os.system('git pull %s %s' % (options.pull[0], options.pull[1]))
- os.chdir('lib')
- os.system('git pull %s %s' % (options.pull[0], options.pull[1]))
-
- elif options.push:
- os.system('git commit -a -m "%s"' % options.push[2])
- os.system('git push %s %s' % (options.push[0], options.push[1]))
- os.chdir('lib')
- os.system('git commit -a -m "%s"' % options.push[2])
- os.system('git push %s %s' % (options.push[0], options.push[1]))
-
- # patch
- elif options.patch_list:
- # clear log
- webnotes.modules.patch_handler.log_list = []
-
- # run individual patches
- for patch in options.patch_list:
- webnotes.modules.patch_handler.run_single(\
- patchmodule = patch, force = options.force)
-
- print '\n'.join(webnotes.modules.patch_handler.log_list)
-
- # reload
- elif options.reload_doc:
- webnotes.modules.patch_handler.reload_doc(\
- {"module":options.reload_doc[0], "dt":options.reload_doc[1], "dn":options.reload_doc[2]})
- print '\n'.join(webnotes.modules.patch_handler.log_list)
-
- elif options.export_doc:
- from webnotes.modules import export_doc
- export_doc(options.export_doc[0], options.export_doc[1])
-
- # run all pending
- elif options.run_latest:
- webnotes.modules.patch_handler.run_all()
- 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)
-
- elif options.diff_ref_file is not None:
- import webnotes.modules.diff
- webnotes.modules.diff.diff_ref_file()
-
- elif options.diff_ref_db is not None:
- import webnotes.modules.diff
- webnotes.modules.diff.diff_ref_db()
-
- elif options.run_scheduler:
- import webnotes.utils.scheduler
- print webnotes.utils.scheduler.execute()
-
- elif options.run_scheduler_event is not None:
- import webnotes.utils.scheduler
- print webnotes.utils.scheduler.trigger('execute_' + options.run_scheduler_event)
-
- elif options.cci is not None:
- if options.cci=='all':
- webnotes.conn.sql("DELETE FROM __CacheItem")
- else:
- from webnotes.utils.cache import CacheItem
- CacheItem(options.cci).clear()
-
- elif options.sync_all is not None:
- import webnotes.model.sync
- webnotes.model.sync.sync_all(options.force or 0)
-
- elif options.sync is not None:
- import webnotes.model.sync
- webnotes.model.sync.sync(options.sync[0], options.sync[1], options.force or 0)
-
- # print messages
- if webnotes.message_log:
- print '\n'.join(webnotes.message_log)
-
-if __name__=='__main__':
- run()