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 1f7efb571d..c70745e7e2 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 3ff20a3e84..354e248e53 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 @@ -258,4 +251,4 @@ cur_frm.cscript.make_si_list = function(parent,doc){ \ ', data); }); -} \ No newline at end of file +} diff --git a/erpnext/selling/doctype/lead/lead.js b/erpnext/selling/doctype/lead/lead.js index a167281a95..4aa460d695 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/setup/doctype/contact_control/contact_control.js b/erpnext/setup/doctype/contact_control/contact_control.js index 51fc5cf4ae..aca8995951 100755 --- a/erpnext/setup/doctype/contact_control/contact_control.js +++ b/erpnext/setup/doctype/contact_control/contact_control.js @@ -103,16 +103,6 @@ cur_frm.cscript.country = function(doc, dt, dn) { cur_frm.cscript.get_states(doc, dt, dn); } -// territory help - cutsomer + sales partner -// ----------------------------------------- -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); -} // get query select Territory // --------------------------- diff --git a/erpnext/setup/doctype/sales_person/sales_person.js b/erpnext/setup/doctype/sales_person/sales_person.js index 0057ff0d77..f3e01a14a2 100644 --- a/erpnext/setup/doctype/sales_person/sales_person.js +++ b/erpnext/setup/doctype/sales_person/sales_person.js @@ -38,15 +38,6 @@ cur_frm.cscript.country = function(doc, cdt, cdn) { ); } -cur_frm.cscript.TreePage = function(nm){ - var call_back = function(){ - var sb_obj = new SalesBrowser(); - sb_obj.set_val(nm); - - } - loadpage('Sales Browser',call_back); - -} //get query select sales person cur_frm.fields_dict['parent_sales_person'].get_query = function(doc,cdt,cdn) { diff --git a/erpnext/setup/doctype/sales_person/sales_person.txt b/erpnext/setup/doctype/sales_person/sales_person.txt index 45769e1ea8..5ff8e9414d 100644 --- a/erpnext/setup/doctype/sales_person/sales_person.txt +++ b/erpnext/setup/doctype/sales_person/sales_person.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-27 14:36:23', + 'creation': '2012-04-13 11:56:32', 'docstatus': 0, - 'modified': '2012-03-27 18:49:47', + 'modified': '2012-05-31 11:28:32', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -25,7 +25,7 @@ 'section_style': u'Simple', 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 132 + 'version': 1 }, # These values are common for all DocField @@ -55,6 +55,46 @@ 'name': u'Sales Person' }, + # 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 User', + 'write': 0 + }, + + # DocPerm + { + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Sales User', + 'write': 0 + }, + # DocPerm { 'cancel': 1, @@ -75,46 +115,6 @@ 'write': 0 }, - # 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 User', - 'write': 0 - }, - - # DocPerm - { - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Sales User', - 'write': 0 - }, - # DocField { 'doctype': u'DocField', @@ -316,7 +316,7 @@ 'fieldtype': u'HTML', 'label': u'Territory Help', 'oldfieldtype': u'HTML', - 'options': u'To 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 3752f26a26..09b0315687 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 2a1cc4d76a..363280128c 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 33e5f77225..65698c1f87 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 9cdb99f008..d23e3ca99d 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 },