nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-19 13:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[merge]

Browse Source
This commit is contained in:
Rushabh Mehta
2013-06-24 15:47:02 +05:30
parent 847cfe2b07 82366d3bb8
commit 7925bd7079
28 changed files with 289 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
public/js/complete_setup.js
View File

@@ -75,12 +75,17 @@ $.extend(erpnext.complete_setup, {
if(!data) return;
$(this).set_working();
$c_obj('Setup Control','setup_account',data,function(r, rt){
sys_defaults = r.message;
user_fullname = r.message.user_fullname;
wn.boot.user_info[user].fullname = user_fullname;
d.hide();
$('header').toggle(true);
wn.container.wntoolbar.set_user_name();
if(!r.exc) {
sys_defaults = r.message;
user_fullname = r.message.user_fullname;
wn.boot.user_info[user].fullname = user_fullname;
d.hide();
$('header').toggle(true);
wn.container.wntoolbar.set_user_name();
setTimeout(function() { window.location.reload(); }, 3000);
}
});
};

2
public/js/purchase_trends_filters.js
View File

@@ -4,7 +4,7 @@ var get_filters = function(){
"fieldname":"period",
"label": "Period",
"fieldtype": "Select",
"options": ["Monthly", "Quarterly", "Half-yearly", "Yearly"].join("\n"),
"options": ["Monthly", "Quarterly", "Half-Yearly", "Yearly"].join("\n"),
"default": "Monthly"
},
{

2
public/js/sales_trends_filters.js
View File

@@ -4,7 +4,7 @@ var get_filters = function(){
"fieldname":"period",
"label": "Period",
"fieldtype": "Select",
"options": ["Monthly", "Quarterly", "Half-yearly", "Yearly"].join("\n"),
"options": ["Monthly", "Quarterly", "Half-Yearly", "Yearly"].join("\n"),
"default": "Monthly"
},
{