merged conflict in gl_control.py
diff --git a/.gitignore b/.gitignore
index 9d124a7..e9c8fc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
*.pyc
*.comp.js
+*.txt
.DS_Store
+server_tools
+patch.log
diff --git a/accounts/doctype/gl_control/gl_control.py b/accounts/doctype/gl_control/gl_control.py
index ecbdd29..5ec8ecd 100644
--- a/accounts/doctype/gl_control/gl_control.py
+++ b/accounts/doctype/gl_control/gl_control.py
@@ -384,7 +384,7 @@
# set voucher balance
#sql("update `tab%s` set outstanding_amount=%s where name='%s'" % (voucher_obj.doc.doctype, bal, voucher_obj.doc.name))
- set(voucher_obj.doc, 'outstanding_amount', flt(bal))
+ webnotes.conn.set(voucher_obj.doc, 'outstanding_amount', flt(bal))
# Send Mail
if msg:
@@ -399,9 +399,7 @@
sendmail(['support@iwebnotes.com'], subject='Repair Outstanding Amount', parts = [('text/plain', email_msg)])
# Acknowledge User
msgprint(cstr(voucher_obj.doc.doctype) + " : " + cstr(voucher_obj.doc.name) + " has been checked" + cstr(msg and " and repaired successfully." or ". No changes Found."))
-
-
- #==============================================================
+
def repost_illegal_cancelled(self, after_date='2011-01-01'):
"""
Find vouchers that are not cancelled correctly and repost them
diff --git a/home/__init__.py b/home/__init__.py
index 3d1f036..9e807df 100644
--- a/home/__init__.py
+++ b/home/__init__.py
@@ -95,7 +95,6 @@
"adds a new feed"
if method=='validate':
return
-
subject, color = feed_dict.get(doc.doctype, [None, None])
if subject:
subject = subject % doc.fields
diff --git a/home/page/event_updates/event_updates.js b/home/page/event_updates/event_updates.js
index 4ae0857..7ecfbdc 100644
--- a/home/page/event_updates/event_updates.js
+++ b/home/page/event_updates/event_updates.js
@@ -618,14 +618,7 @@
// system_messages
if(r.message.system_message)
pscript.show_system_message(wrapper, r.message.system_message);
-
- // trial
- if(pscript.is_erpnext_saas && cint(r.message.is_trial) && in_list(user_roles, 'System Manager')) {
- pscript.trial_box = $a(div, 'div', 'help_box', {margin:'2px 8px 2px 0px'}, "Your Free Trial expires in " +
- r.message.days_to_expiry + " days. When you are satisfied, please <span class='link_type' onclick='pscript.convert_to_paid()'>please click here</span> to convert to a paid account." +
- "<br>To get help, view <a href='http://erpnext.blogspot.com/2011/02/getting-started-with-your-erpnext.html' target='_blank'>Getting Started with Your System</a> (opens in a new page)");
- }
-
+
// render online users
pscript.online_users_obj.render(r.message.online_users);
pscript.online_users = r.message.online_users;
@@ -635,16 +628,6 @@
// show system message
// -------------------
-pscript.convert_to_paid = function() {
- var callback = function(r,rt) {
- if(r.exc) { msgprint(r.exc); return; }
- $(pscript.trial_box).slideUp();
- }
- $c_page('home','event_updates','convert_to_paid','',callback)
-}
-
-// show system message
-// -------------------
pscript.show_system_message = function(wrapper, msg) {
$ds(wrapper.system_message_area);
var txt = $a(wrapper.system_message_area, 'div', '', {lineHeight:'1.6em'});
diff --git a/home/page/event_updates/event_updates.py b/home/page/event_updates/event_updates.py
index 8f5068c..ce73cd1 100644
--- a/home/page/event_updates/event_updates.py
+++ b/home/page/event_updates/event_updates.py
@@ -43,14 +43,3 @@
'is_trial': webnotes.conn.get_global('is_trial'),
'days_to_expiry': (webnotes.conn.get_global('days_to_expiry') or '0')
}
-
-#
-# Convert to a paid account
-#
-def convert_to_paid():
- from server_tools.server_tools.gateway_utils import convert_to_paid_gateway
- r = convert_to_paid_gateway()
- if r['exc']:
- webnotes.msgprint(r['exc'])
- raise Exception, r['exc']
- webnotes.msgprint('Thank you for choosing to convert to a Paid Account!')
diff --git a/home/page/my_company/my_company.py b/home/page/my_company/my_company.py
index 2d47cbc..58a82ad 100644
--- a/home/page/my_company/my_company.py
+++ b/home/page/my_company/my_company.py
@@ -6,14 +6,14 @@
except: import simplejson as json
def get_account_settings_url(arg=''):
- import server_tools.server_tools.gateway_utils
- return server_tools.server_tools.gateway_utils.get_account_settings_url()
+ import server_tools.gateway_utils
+ return server_tools.gateway_utils.get_account_settings_url()
#
# set max users
#
def get_max_users(arg=''):
- from server_tools.server_tools.gateway_utils import get_max_users_gateway
+ from server_tools.gateway_utils import get_max_users_gateway
return {
'max_users': get_max_users_gateway(),
'enabled': cint(webnotes.conn.sql("select count(*) from tabProfile where ifnull(enabled,0)=1 and name not in ('Administrator', 'Guest')")[0][0])
@@ -44,7 +44,7 @@
webnotes.conn.sql("update tabProfile set enabled=0, docstatus=2 where name=%s", args['user'])
# erpnext-saas
if cint(webnotes.conn.get_value('Control Panel', None, 'sync_with_gateway')):
- from server_tools.server_tools.gateway_utils import remove_user_gateway
+ from server_tools.gateway_utils import remove_user_gateway
remove_user_gateway(args['user'])
#
@@ -55,7 +55,7 @@
add_profile(args['user'])
# erpnext-saas
if cint(webnotes.conn.get_value('Control Panel', None, 'sync_with_gateway')):
- from server_tools.server_tools.gateway_utils import add_user_gateway
+ from server_tools.gateway_utils import add_user_gateway
add_user_gateway(args['user'])
#
diff --git a/home/page/profile_settings/profile_settings.py b/home/page/profile_settings/profile_settings.py
index 3703d27..f9124b6 100644
--- a/home/page/profile_settings/profile_settings.py
+++ b/home/page/profile_settings/profile_settings.py
@@ -2,15 +2,16 @@
from webnotes.utils import load_json, cint, nowdate
-#
-# change profile (remote)
-#
+
def change_password(arg):
+ """
+ Change password
+ """
arg = load_json(arg)
if cint(webnotes.conn.get_value('Control Panel',None,'sync_with_gateway')):
- import server_tools.server_tools.gateway_utils
- webnotes.msgprint(server_tools.server_tools.gateway_utils.change_password(arg['old_password'], arg['new_password'])['message'])
+ import server_tools.gateway_utils
+ webnotes.msgprint(server_tools.gateway_utils.change_password(arg['old_password'], arg['new_password'])['message'])
else:
if not webnotes.conn.sql('select name from tabProfile where name=%s and password=password(%s)', (webnotes.session['user'], arg['old_password'])):
webnotes.msgprint('Old password is not correct', raise_exception=1)
diff --git a/setup/doctype/company/company.txt b/setup/doctype/company/company.txt
index 15ba781..a7498d6 100644
--- a/setup/doctype/company/company.txt
+++ b/setup/doctype/company/company.txt
@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:08:55',
'docstatus': 0,
- 'modified': '2011-07-01 17:43:29',
+ 'modified': '2011-07-06 11:42:34',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
diff --git a/setup/doctype/setup_control/setup_control.py b/setup/doctype/setup_control/setup_control.py
index 1b30660..e01e60a 100644
--- a/setup/doctype/setup_control/setup_control.py
+++ b/setup/doctype/setup_control/setup_control.py
@@ -14,7 +14,6 @@
in_transaction = webnotes.conn.in_transaction
convert_to_lists = webnotes.conn.convert_to_lists
-from server_tools.gateway_utils import update_client_control, get_total_users
# -----------------------------------------------------------------------------------------
@@ -182,6 +181,8 @@
"""
Validates if setup has been performed after database allocation
"""
+
+ from server_tools.gateway_utils import update_client_control, get_total_users
args = eval(args)
#webnotes.logger.error("args in set_account_details of setup_control: " + str(args))
@@ -198,7 +199,6 @@
#webnotes.logger.error("setup_control.is_setup_okay: Passed Values:" + args['account_name'] + " " + args['user'] + " " + str(args['total_users']))
-
if (cp_defaults==args['account_name']) and user_profile and \
(total_users==cint(args['total_users'])):
return 'True'
diff --git a/startup/startup.js b/startup/startup.js
index 0b14391..a93906c 100644
--- a/startup/startup.js
+++ b/startup/startup.js
@@ -448,7 +448,7 @@
// Manage account
// --------------
if(is_system_manager) {
- $td(menu_tab,0,3).innerHTML = '<a style="font-weight: bold; color: #FFF;" href="javascript:pscript.go_to_account_settings()">Billing</a>';
+ $td(menu_tab,0,3).innerHTML = '<a style="font-weight: bold; color: #FFF;" href="#!billing">Billing</a>';
}
}
else{
@@ -468,17 +468,6 @@
}
-// ====================================================================
-
-pscript.go_to_account_settings = function() {
- callback = function(r, rt) {
- if(r.exc) { msgprint(r.exc); }
- else { msgprint('<a href="' + r.message + '" target="_blank">'
- + 'Click here to open Account Settings in a new page</a>') }
- }
- $c_page('home', 'my_company', 'get_account_settings_url', '', callback)
-}
-
// chart of accounts
// ====================================================================
show_chart_browser = function(nm, chart_type){