From 353bc313a6d5ed5ad06f14aab61ff6dc4aacc49e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 31 May 2012 11:43:14 +0530 Subject: [PATCH] Link to Sales/accounts browser fixed --- .../period_closing_voucher.txt | 45 +- erpnext/selling/doctype/customer/customer.js | 7 - erpnext/selling/doctype/lead/lead.js | 10 +- .../doctype/sales_common/sales_common.js | 20 - .../page/sales_browser/sales_browser.js | 433 ------------------ .../contact_control/contact_control.js | 10 - .../doctype/sales_person/sales_person.js | 9 - .../doctype/sales_person/sales_person.txt | 88 ++-- erpnext/setup/doctype/territory/territory.js | 10 - erpnext/setup/doctype/territory/territory.txt | 108 ++--- erpnext/stock/doctype/item/item.js | 9 - erpnext/stock/doctype/item/item.txt | 6 +- 12 files changed, 130 insertions(+), 625 deletions(-) diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.txt b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.txt index 1f7efb571d5..c70745e7e22 100644 --- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.txt +++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-27 14:35:46', + 'creation': '2012-04-13 11:56:17', 'docstatus': 0, - 'modified': '2012-03-27 14:45:49', + 'modified': '2012-05-31 11:38:17', 'modified_by': u'Administrator', 'owner': u'jai@webnotestech.com' }, @@ -24,7 +24,7 @@ 'section_style': u'Simple', 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 123 + 'version': 1 }, # These values are common for all DocField @@ -94,6 +94,20 @@ 'role': u'Accounts Manager' }, + # DocPerm + { + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'System Manager' + }, + + # DocPerm + { + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Accounts Manager' + }, + # DocPerm { 'amend': 1, @@ -117,20 +131,6 @@ 'write': 1 }, - # DocPerm - { - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'System Manager' - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Accounts Manager' - }, - # DocField { 'doctype': u'DocField', @@ -238,6 +238,17 @@ 'trigger': u'Client' }, + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'coa_help', + 'fieldtype': u'HTML', + 'label': u'CoA Help', + 'oldfieldtype': u'HTML', + 'options': u'To manage Account Head, click here', + 'permlevel': 0 + }, + # DocField { 'doctype': u'DocField', diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js index 78743e78da3..33445b7abb8 100644 --- a/erpnext/selling/doctype/customer/customer.js +++ b/erpnext/selling/doctype/customer/customer.js @@ -133,13 +133,6 @@ cur_frm.fields_dict['customer_group'].get_query = function(doc,dt,dn) { return 'SELECT `tabCustomer Group`.`name`, `tabCustomer Group`.`parent_customer_group` FROM `tabCustomer Group` WHERE `tabCustomer Group`.`is_group` = "No" AND `tabCustomer Group`.`docstatus`!= 2 AND `tabCustomer Group`.%(key)s LIKE "%s" ORDER BY `tabCustomer Group`.`name` ASC LIMIT 50'; } -cur_frm.cscript.CGHelp = function(doc,dt,dn){ - var call_back = function(){ - var sb_obj = new SalesBrowser(); - sb_obj.set_val('Customer Group'); - } - loadpage('Sales Browser',call_back); -} // ----- // lead diff --git a/erpnext/selling/doctype/lead/lead.js b/erpnext/selling/doctype/lead/lead.js index a167281a951..4aa460d695b 100644 --- a/erpnext/selling/doctype/lead/lead.js +++ b/erpnext/selling/doctype/lead/lead.js @@ -22,7 +22,7 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) { if(user =='Guest'){ hide_field(['status', 'naming_series', 'order_lost_reason', 'customer', 'rating', 'fax', 'website', 'territory', - 'TerritoryHelp', 'address_line1', 'address_line2', 'city', 'state', + 'address_line1', 'address_line2', 'city', 'state', 'country', 'pincode', 'address', 'lead_owner', 'market_segment', 'industry', 'campaign_name', 'interested_in', 'company', 'fiscal_year', 'contact_by', 'contact_date', 'last_contact_date', @@ -62,14 +62,6 @@ cur_frm.cscript.status = function(doc, cdt, cdn){ cur_frm.cscript.refresh(doc, cdt, cdn); } -cur_frm.cscript.TerritoryHelp = function(doc,dt,dn){ - var call_back = function(){ - var sb_obj = new SalesBrowser(); - sb_obj.set_val('Territory'); - } - - loadpage('Sales Browser',call_back); -} //Trigger in Item Table //=================================== diff --git a/erpnext/selling/doctype/sales_common/sales_common.js b/erpnext/selling/doctype/sales_common/sales_common.js index 32c5d9e6a8d..f495b99a607 100644 --- a/erpnext/selling/doctype/sales_common/sales_common.js +++ b/erpnext/selling/doctype/sales_common/sales_common.js @@ -170,26 +170,6 @@ cur_frm.cscript.hide_price_list_currency = function(doc, cdt, cdn, callback1) { } -//====================opens territory tree page ================== -cur_frm.cscript.TerritoryHelp = function(doc,dt,dn){ - var call_back = function(){ - - var sb_obj = new SalesBrowser(); - sb_obj.set_val('Territory'); - } - loadpage('Sales Browser',call_back); -} - -//====================opens customer group tree page ================== -cur_frm.cscript.CGHelp = function(doc,dt,dn){ - var call_back = function(){ - var sb_obj = new SalesBrowser(); - sb_obj.set_val('Customer Group'); - } - loadpage('Sales Browser',call_back); -} - - // TRIGGERS FOR CALCULATIONS // ===================================================================================================== diff --git a/erpnext/selling/page/sales_browser/sales_browser.js b/erpnext/selling/page/sales_browser/sales_browser.js index 4d5a3dcfa11..785b17ab1ca 100644 --- a/erpnext/selling/page/sales_browser/sales_browser.js +++ b/erpnext/selling/page/sales_browser/sales_browser.js @@ -129,436 +129,3 @@ erpnext.SalesChart = Class.extend({ return this.tree.$w.find('.tree-link.selected'); } }); - -/* -pscript['onshow_Sales Browser'] = function(){ - wn.require('lib/js/legacy/widgets/tree.js'); - - var route = decodeURIComponent(location.hash); - if(route.indexOf('/')!=-1) { - var chart_type = route.split('/')[1]; - new SalesBrowser().set_val(chart_type) - return; - } - - var parent = $i('tr_body'); - parent.innerHTML = 'Please select your chart: ' - var sel = $a(parent,'select'); - add_sel_options(sel, ['Territory', 'Customer Group', 'Item Group', 'Sales Person'], 'Territory'); - var btn = $btn(parent, 'Go', function() { new SalesBrowser().set_val(sel_val(sel)) }, {marginTop:'8px'}); -} - -//================================= SalesBrowser Class ====================================== -SalesBrowser = function(){ - - this.make_body = function(){ - - $i('tr_header').innerHTML = ''; - $i('tr_body').innerHTML = ''; - //make header - var desc = this.sel; - var me = this; - var h = new PageHeader($i('tr_header'),desc); - h.add_button('New '+this.sel, function() { me.set_dialog(1); }, 0, 'ui-icon-plus', 1); - h.add_button('Refresh', function() { me.refresh_tree(); }, 0, 'ui-icon-refresh'); - - var div_body = $a($i('tr_body'),'div'); - var tr_main_grid = make_table(div_body,1,2,'100%',['60%','40%'],{width: "100%", tableLayout: "fixed", borderCollapse: "collapse", border:"0px", padding:"4px 4px 4px 4px"}); - - $y($td(tr_main_grid,0,0),{border: "1px solid #dddddd", padding: "8px", width: "60%"}); - this.tree_area = $a($td(tr_main_grid,0,0),'div','',{minHeight:'400px'}); - - $y($td(tr_main_grid,0,1),{border: "1px solid #DDD"}); - this.detail_area = $a($td(tr_main_grid,0,1),'div'); - - this.make_tree_body(this.tree_area); - this.refresh_tree(); - } - - this.set_val = function(b){ - var me = this; - me.sel = b; - me.make_body(); - } -} - -//================================================================================================================================= -SalesBrowser.prototype.make_tree_body = function(parent){ - - //this.tab2 =make_table(this.wrapper,1,2,'100%',['60%','40%']); - this.make_tree(); - this.make_rgt_sect(); - -} - -//================================================================================================================================= -SalesBrowser.prototype.make_rgt_sect=function(){ - //var d = $a($td(this.tab2,0,1),'div','',{border:'1px solid #000'}); - - this.rgt_tab =make_table(this.detail_area,4,1,'','',{padding:"4px",spacing:"4px"}); - this.dtl = $a($td(this.rgt_tab,0,0),'div'); - this.btn = $a($td(this.rgt_tab,1,0),'div','span'); - this.help = $a($td(this.rgt_tab,2,0),'div'); - this.help.innerHTML = "Note: Explore and click on the tree node to see details." - - this.set_btn(); -} -//================================================================================================================================= -SalesBrowser.prototype.set_btn = function(){ - var me = this; - this.edit_btn = $btn(this.btn,'Edit',function(){ me.set_dialog(2); }); - - this.trash_btn = $btn(this.btn,'Trash',null); - this.trash_btn.onclick = function(){ - var check = confirm("Are you sure you want to trash "+me.cur_node.rec.name+" node?"); - - if(check){ - var arg = [me.cur_node.rec.name, me.sel]; - $c_obj('Sales Browser Control','trash_record',arg.join(','),function(r,rt){ me.refresh_tree();}); - - } - } -} - -//===================================================== -SalesBrowser.prototype.set_dialog = function(f){ - - - if(this.sel == 'Territory') - new MakeDialog('Territory','territory',f,this); //Territory Dialog - if(this.sel == 'Customer Group') - new MakeDialog('Customer Group','customer_group',f,this); //Customer Group Dialog - if(this.sel == 'Item Group') - new MakeDialog('Item Group','item_group',f,this); //Item Group Dialog - if(this.sel == 'Sales Person') - new MakeDialog('Sales Person','sales_person',f,this);//Sales Person Dialog - -} -//=====================================================Make Tree============================================================================ -SalesBrowser.prototype.make_tree = function() { - var me = this; - - this.tree = new Tree(this.tree_area, '100%'); - - //--------------------------------------------------------------------------------------------------------------------------------- - // on click - this.tree.std_onclick = function(node) { - - me.cur_node = node; - if(node.rec.name =='All Customer Groups' || node.rec.name =='All Sales Persons' || node.rec.name =='All Item Groups' || node.rec.name =='All Territories'){ - //$di(me.add_btn); - - $dh(me.edit_btn); - $dh(me.trash_btn); - } - else{ - //$di(me.add_btn); - //if(node.has_children == false) - //$dh(me.add_btn); - - $di(me.edit_btn); - $di(me.trash_btn); - - } - me.make_details(); - - } - //--------------------------------------------------------------------------------------------------------------------------------- - // on expand - this.tree.std_onexp = function(node) { - - if(node.expanded_once)return; - $di(node.loading_div); - - var callback = function(r,rt) { - - $dh(node.loading_div); - var n = me.tree.allnodes[r.message.parent]; - var cl = r.message.cl; - - for(var i=0;iTo manage Territory, click here', + 'options': u'To manage Territories, click here', 'permlevel': 0 }, diff --git a/erpnext/setup/doctype/territory/territory.js b/erpnext/setup/doctype/territory/territory.js index 3752f26a26a..09b03156877 100644 --- a/erpnext/setup/doctype/territory/territory.js +++ b/erpnext/setup/doctype/territory/territory.js @@ -39,13 +39,3 @@ cur_frm.fields_dict['parent_territory'].get_query = function(doc,cdt,cdn) { cur_frm.fields_dict['target_details'].grid.get_field("item_group").get_query = function(doc, cdt, cdn) { return 'SELECT `tabItem Group`.`name`,`tabItem Group`.`parent_item_group` FROM `tabItem Group` WHERE `tabItem Group`.is_group="No" AND `tabItem Group`.docstatus != 2 AND `tabItem Group`.%(key)s LIKE "%s" LIMIT 50' } - -cur_frm.cscript.TerritoryHelp = function(doc,dt,dn){ - var call_back = function(){ - var sb_obj = new SalesBrowser(); - sb_obj.set_val('Territory'); - - } - loadpage('Sales Browser',call_back); - -} \ No newline at end of file diff --git a/erpnext/setup/doctype/territory/territory.txt b/erpnext/setup/doctype/territory/territory.txt index 2a1cc4d76a0..363280128cb 100644 --- a/erpnext/setup/doctype/territory/territory.txt +++ b/erpnext/setup/doctype/territory/territory.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-27 14:36:25', + 'creation': '2012-04-13 11:56:32', 'docstatus': 0, - 'modified': '2012-03-27 18:50:08', + 'modified': '2012-05-31 11:39:33', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -27,7 +27,7 @@ 'section_style': u'Simple', 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 87 + 'version': 1 }, # These values are common for all DocField @@ -57,6 +57,56 @@ 'name': u'Territory' }, + # DocPerm + { + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Sales Manager', + 'write': 0 + }, + + # DocPerm + { + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Sales Manager', + 'write': 0 + }, + + # DocPerm + { + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Sales Master Manager', + 'write': 0 + }, + + # DocPerm + { + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Sales User', + 'write': 0 + }, + + # DocPerm + { + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Sales User', + 'write': 0 + }, + # DocPerm { 'cancel': 1, @@ -67,56 +117,6 @@ 'write': 1 }, - # DocPerm - { - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Sales Manager', - 'write': 0 - }, - - # DocPerm - { - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Sales Manager', - 'write': 0 - }, - - # DocPerm - { - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Sales Master Manager', - 'write': 0 - }, - - # DocPerm - { - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Sales User', - 'write': 0 - }, - - # DocPerm - { - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Sales User', - 'write': 0 - }, - # DocField { 'doctype': u'DocField', @@ -176,7 +176,7 @@ 'fieldtype': u'HTML', 'label': u'TerritoryHelp', 'oldfieldtype': u'HTML', - 'options': u'To manage Territory, click here', + 'options': u'To manage Territories, click here', 'permlevel': 0 }, diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js index 33e5f77225a..65698c1f87c 100644 --- a/erpnext/stock/doctype/item/item.js +++ b/erpnext/stock/doctype/item/item.js @@ -80,15 +80,6 @@ cur_frm.fields_dict['item_group'].get_query = function(doc,cdt,cdn) { return 'SELECT `tabItem Group`.`name`,`tabItem Group`.`parent_item_group` FROM `tabItem Group` WHERE `tabItem Group`.`is_group` = "No" AND `tabItem Group`.`docstatus`!= 2 AND `tabItem Group`.%(key)s LIKE "%s" ORDER BY `tabItem Group`.`name` ASC LIMIT 50' } -cur_frm.cscript.IGHelp = function(doc,dt,dn){ - var call_back = function(){ - var sb_obj = new SalesBrowser(); - sb_obj.set_val('Item Group'); - - } - loadpage('Sales Browser',call_back); -} - // for description from attachment // takes the first attachment and creates // a table with both image and attachment in HTML diff --git a/erpnext/stock/doctype/item/item.txt b/erpnext/stock/doctype/item/item.txt index 9cdb99f008f..d23e3ca99db 100644 --- a/erpnext/stock/doctype/item/item.txt +++ b/erpnext/stock/doctype/item/item.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-04-02 16:02:29', + 'creation': '2012-04-30 18:33:53', 'docstatus': 0, - 'modified': '2012-04-30 14:08:08', + 'modified': '2012-05-31 11:18:10', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -216,7 +216,7 @@ 'fieldtype': u'HTML', 'label': u'IGHelp', 'oldfieldtype': u'HTML', - 'options': u'To manage Item Group, click here', + 'options': u'To manage Item Groups, click here', 'permlevel': 0 },