From 9b64ca86162cdd71c665fe0cbce3fc5114f3ff80 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 1 May 2012 17:11:36 +0530 Subject: [PATCH 1/5] double column fix --- js/all-app.js | 3 ++- js/all-web.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/js/all-app.js b/js/all-app.js index 2526a05313..e5289fba22 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -210,7 +210,8 @@ wn.provide('wn.model');wn.model={no_value_type:['Section Break','Column Break',' * lib/js/wn/meta.js */ wn.provide('wn.meta.docfield_map');wn.provide('wn.meta.docfield_list');wn.provide('wn.meta.doctypes');$.extend(wn.meta,{add_field:function(df){wn.provide('wn.meta.docfield_map.'+df.parent);wn.meta.docfield_map[df.parent][df.fieldname||df.label]=df;if(!wn.meta.docfield_list[df.parent]) -wn.meta.docfield_list[df.parent]=[] +wn.meta.docfield_list[df.parent]=[];for(var i in wn.meta.docfield_list[df.parent]){var d=wn.meta.docfield_list[df.parent][i];if(df.fieldname==d.fieldname) +return;} wn.meta.docfield_list[df.parent].push(df);}}); /* * lib/js/wn/misc/tools.js diff --git a/js/all-web.js b/js/all-web.js index a91934bfa1..cb6efeb0cb 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -97,7 +97,8 @@ wn.provide('wn.model');wn.model={no_value_type:['Section Break','Column Break',' * lib/js/wn/meta.js */ wn.provide('wn.meta.docfield_map');wn.provide('wn.meta.docfield_list');wn.provide('wn.meta.doctypes');$.extend(wn.meta,{add_field:function(df){wn.provide('wn.meta.docfield_map.'+df.parent);wn.meta.docfield_map[df.parent][df.fieldname||df.label]=df;if(!wn.meta.docfield_list[df.parent]) -wn.meta.docfield_list[df.parent]=[] +wn.meta.docfield_list[df.parent]=[];for(var i in wn.meta.docfield_list[df.parent]){var d=wn.meta.docfield_list[df.parent][i];if(df.fieldname==d.fieldname) +return;} wn.meta.docfield_list[df.parent].push(df);}}); /* * lib/js/wn/misc/tools.js From 98ae634c50e9ff8654bb435b298dbc61ffaed8a6 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 1 May 2012 18:31:40 +0530 Subject: [PATCH 2/5] fixes in sales order item widths --- erpnext/selling/doctype/sales_order/sales_order.txt | 3 +-- erpnext/selling/doctype/sales_order_item/sales_order_item.txt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.txt b/erpnext/selling/doctype/sales_order/sales_order.txt index 381d471712..ea862853b0 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.txt +++ b/erpnext/selling/doctype/sales_order/sales_order.txt @@ -392,8 +392,7 @@ 'oldfieldtype': u'Table', 'options': u'Sales Order Item', 'permlevel': 0, - 'print_hide': 0, - 'width': u'40px' + 'print_hide': 0 }, # DocField diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.txt b/erpnext/selling/doctype/sales_order_item/sales_order_item.txt index 854d2f9441..38cdd83541 100644 --- a/erpnext/selling/doctype/sales_order_item/sales_order_item.txt +++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.txt @@ -68,7 +68,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'width': u'150' + 'width': u'150px' }, # DocField From 5e03d97ce86cb714c578bce486b1ccb056e88c95 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 1 May 2012 19:09:10 +0530 Subject: [PATCH 3/5] logout fix --- js/all-app.js | 4 ++-- js/all-web.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/js/all-app.js b/js/all-app.js index e5289fba22..fa5a4184b0 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -271,7 +271,7 @@ wn.get_route_str=function(route){if(!route) route=window.location.hash;if(route.substr(0,1)=='#')route=route.substr(1);if(route.substr(0,1)=='!')route=route.substr(1);return route;} wn.set_route=function(){route=$.map(arguments,function(a){return encodeURIComponent(a)}).join('/');window.location.hash=route;wn.app.set_favicon();} wn._cur_route=null;$(window).bind('hashchange',function(){if(location.hash==wn._cur_route) -return;wn.route();if(wn.boot.analytics_code){try{eval(wn.boot.analytics_code);}catch(e){console.log(e);}}}); +return;wn.route();}); /* * lib/js/wn/ui/listing.js */ @@ -2212,7 +2212,7 @@ me.dialog.clear();me.dialog.show();}}); 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.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);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();},make_nav_bar:function(){if(wn.user.name!='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;} +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();},make_nav_bar:function(){if(wn.user.name!='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);} 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='\ \ ' diff --git a/js/all-web.js b/js/all-web.js index cb6efeb0cb..e36ad77ba1 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -158,7 +158,7 @@ wn.get_route_str=function(route){if(!route) route=window.location.hash;if(route.substr(0,1)=='#')route=route.substr(1);if(route.substr(0,1)=='!')route=route.substr(1);return route;} wn.set_route=function(){route=$.map(arguments,function(a){return encodeURIComponent(a)}).join('/');window.location.hash=route;wn.app.set_favicon();} wn._cur_route=null;$(window).bind('hashchange',function(){if(location.hash==wn._cur_route) -return;wn.route();if(wn.boot.analytics_code){try{eval(wn.boot.analytics_code);}catch(e){console.log(e);}}}); +return;wn.route();}); /* * lib/js/wn/ui/listing.js */ @@ -823,7 +823,7 @@ if(errfld.length)msgprint('Mandatory fields required in '+ 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.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);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();},make_nav_bar:function(){if(wn.user.name!='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;} +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();},make_nav_bar:function(){if(wn.user.name!='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);} 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='\ \ ' From 3e73ce4107f4d50694596a836d4e7646215b72ad Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 2 May 2012 09:30:53 +0530 Subject: [PATCH 4/5] logout, console fix --- js/all-app.js | 7 ++++--- js/all-web.js | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/js/all-app.js b/js/all-app.js index fa5a4184b0..a588369305 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -517,7 +517,8 @@ me.list.run();});this.dialog.show();},add_column:function(c){var w=$('
\ ' diff --git a/js/all-web.js b/js/all-web.js index e36ad77ba1..f5eb4f6ae0 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -404,7 +404,8 @@ me.list.run();});this.dialog.show();},add_column:function(c){var w=$('
Mandatory fields required in '+ 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.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);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();},make_nav_bar:function(){if(wn.user.name!='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);} +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();},make_nav_bar:function(){if(wn.user.name!='Guest'){wn.container.wntoolbar=new wn.ui.toolbar.Toolbar();}},logout:function(){var me=this;me.logged_out=true;wn.call({method:'logout',callback:function(r){if(r.exc){console.log(r.exc);} 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='\ \ ' From 8eba118379337b21e1997983fd7af9f744d014ca Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 2 May 2012 09:45:28 +0530 Subject: [PATCH 5/5] font fix --- css/all-app.css | 8 ++++---- css/all-web.css | 8 ++++---- erpnext/startup/startup.css | 4 ++-- js/all-app.js | 3 ++- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/css/all-app.css b/css/all-app.css index e308d5eed1..52ec6823b6 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -1937,12 +1937,12 @@ body { /* font settings */ h1, h2, h3, h4, h5 { - font-family: "Helvetica Neue", Helvetica, "Helvetica Neue", sans-serif; + font-family: Arial, sans-serif; margin-top: 0.2em; } body { - font-family: "Helvetica Neue", Helvetica, "Helvetica Neue", sans-serif; + font-family: Arial, sans-serif; font-size: 13px; background-color: #eee; } @@ -3783,12 +3783,12 @@ div.appframe-toolbar { * erpnext/startup/startup.css */ h1, h2, h3, h4, h5 { - font-family: "Helvetica Neue", "Open Sans", Helvetica, sans-serif; + font-family: Arial, Helvetica, sans-serif; margin-top: 0.2em; } body { - font-family: "Helvetica Neue", "Open Sans", Helvetica, sans-serif; + font-family: Arial, Helvetica, sans-serif; font-size: 13px; } diff --git a/css/all-web.css b/css/all-web.css index 3cacea47af..1d8f8d6e30 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -1798,12 +1798,12 @@ body { /* font settings */ h1, h2, h3, h4, h5 { - font-family: "Helvetica Neue", Helvetica, "Helvetica Neue", sans-serif; + font-family: Arial, sans-serif; margin-top: 0.2em; } body { - font-family: "Helvetica Neue", Helvetica, "Helvetica Neue", sans-serif; + font-family: Arial, sans-serif; font-size: 13px; background-color: #eee; } @@ -2481,12 +2481,12 @@ div.appframe-toolbar { * erpnext/startup/startup.css */ h1, h2, h3, h4, h5 { - font-family: "Helvetica Neue", "Open Sans", Helvetica, sans-serif; + font-family: Arial, Helvetica, sans-serif; margin-top: 0.2em; } body { - font-family: "Helvetica Neue", "Open Sans", Helvetica, sans-serif; + font-family: Arial, Helvetica, sans-serif; font-size: 13px; } diff --git a/erpnext/startup/startup.css b/erpnext/startup/startup.css index 490b2f4ee9..de76623bb2 100644 --- a/erpnext/startup/startup.css +++ b/erpnext/startup/startup.css @@ -1,10 +1,10 @@ h1, h2, h3, h4, h5 { - font-family: "Helvetica Neue", "Open Sans", Helvetica, sans-serif; + font-family: Arial, Helvetica, sans-serif; margin-top: 0.2em; } body { - font-family: "Helvetica Neue", "Open Sans", Helvetica, sans-serif; + font-family: Arial, Helvetica, sans-serif; font-size: 13px; } diff --git a/js/all-app.js b/js/all-app.js index a588369305..6e232cf174 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -1724,7 +1724,8 @@ _p.show_dialog();} _f.Frm.prototype.email_doc=function(){if(!_e.dialog)_e.make();sel=this.print_sel;var c=$td(_e.dialog.rows['Format'].tab,0,1);if(c.cur_sel){c.removeChild(c.cur_sel);c.cur_sel=null;} c.appendChild(this.print_sel);c.cur_sel=this.print_sel;_e.dialog.widgets['Send With Attachments'].checked=0;if(cur_frm.doc.file_list){$ds(_e.dialog.rows['Send With Attachments']);}else{$dh(_e.dialog.rows['Send With Attachments']);} _e.dialog.widgets['Subject'].value=get_doctype_label(this.meta.name)+': '+this.docname;_e.dialog.show();} -_f.Frm.prototype.rename_notify=function(dt,old,name){if(this.docname==old) +_f.Frm.prototype.rename_notify=function(dt,old,name){if(this.meta.in_dialog) +return;if(this.docname==old) this.docname=name;else return;this.is_editable[name]=this.is_editable[old];delete this.is_editable[old];if(this&&this.opendocs[old]){local_dt[dt][name]=local_dt[dt][old];local_dt[dt][old]=null;} delete this.opendocs[old];this.opendocs[name]=true;wn.re_route[window.location.hash]='Form/'+encodeURIComponent(this.doctype)+'/'+encodeURIComponent(name);wn.set_route('Form',this.doctype,name);}