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

fixed conflict

Browse Source
This commit is contained in:
Nabin Hait
2012-05-31 11:47:09 +05:30
parent 4aaaa8af7b 353bc313a6
commit 5c1de3a639
10 changed files with 131 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.txt
View File

@@ -3,9 +3,9 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
'creation': '2012-03-27 14:35:46', 'creation': '2012-04-13 11:56:17',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-27 14:45:49', 'modified': '2012-05-31 11:38:17',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'jai@webnotestech.com' 'owner': u'jai@webnotestech.com'
}, },
@@ -24,7 +24,7 @@
'section_style': u'Simple', 'section_style': u'Simple',
'server_code_error': u' ', 'server_code_error': u' ',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 123 'version': 1
}, },
# These values are common for all DocField # These values are common for all DocField
@@ -94,6 +94,20 @@
'role': u'Accounts Manager' '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 # DocPerm
{ {
'amend': 1, 'amend': 1,
@@ -117,20 +131,6 @@
'write': 1 'write': 1
}, },
# DocPerm
{
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'System Manager'
},
# DocPerm
{
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Accounts Manager'
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
@@ -238,6 +238,17 @@
'trigger': u'Client' 'trigger': u'Client'
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'coa_help',
'fieldtype': u'HTML',
'label': u'CoA Help',
'oldfieldtype': u'HTML',
'options': u'<a href="#!Accounts Browser/Account">To manage Account Head, click here</a>',
'permlevel': 0
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',

9
erpnext/selling/doctype/customer/customer.js
View File

@@ -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'; 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 // lead
@@ -258,4 +251,4 @@ cur_frm.cscript.make_si_list = function(parent,doc){
</td> \ </td> \
</tr></table>', data); </tr></table>', data);
}); });
} }

10
erpnext/selling/doctype/lead/lead.js
View File

@@ -22,7 +22,7 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
if(user =='Guest'){ if(user =='Guest'){
hide_field(['status', 'naming_series', 'order_lost_reason', hide_field(['status', 'naming_series', 'order_lost_reason',
'customer', 'rating', 'fax', 'website', 'territory', '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', 'country', 'pincode', 'address', 'lead_owner', 'market_segment',
'industry', 'campaign_name', 'interested_in', 'company', 'industry', 'campaign_name', 'interested_in', 'company',
'fiscal_year', 'contact_by', 'contact_date', 'last_contact_date', '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.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 //Trigger in Item Table
//=================================== //===================================

10
erpnext/setup/doctype/contact_control/contact_control.js
View File

@@ -103,16 +103,6 @@ cur_frm.cscript.country = function(doc, dt, dn) {
cur_frm.cscript.get_states(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 // get query select Territory
// --------------------------- // ---------------------------

9
erpnext/setup/doctype/sales_person/sales_person.js
View File

@@ -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 //get query select sales person
cur_frm.fields_dict['parent_sales_person'].get_query = function(doc,cdt,cdn) { cur_frm.fields_dict['parent_sales_person'].get_query = function(doc,cdt,cdn) {

88
erpnext/setup/doctype/sales_person/sales_person.txt
View File

@@ -3,9 +3,9 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
'creation': '2012-03-27 14:36:23', 'creation': '2012-04-13 11:56:32',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-27 18:49:47', 'modified': '2012-05-31 11:28:32',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@@ -25,7 +25,7 @@
'section_style': u'Simple', 'section_style': u'Simple',
'server_code_error': u' ', 'server_code_error': u' ',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 132 'version': 1
}, },
# These values are common for all DocField # These values are common for all DocField
@@ -55,6 +55,46 @@
'name': u'Sales Person' '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 # DocPerm
{ {
'cancel': 1, 'cancel': 1,
@@ -75,46 +115,6 @@
'write': 0 '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 # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
@@ -316,7 +316,7 @@
'fieldtype': u'HTML', 'fieldtype': u'HTML',
'label': u'Territory Help', 'label': u'Territory Help',
'oldfieldtype': u'HTML', 'oldfieldtype': u'HTML',
'options': u'<a href="javascript:cur_frm.cscript.TreePage(\'Territory\');">To manage Territory, click here</a>', 'options': u'<a href="#!Sales Browser/Territory">To manage Territories, click here</a>',
'permlevel': 0 'permlevel': 0
}, },

10
erpnext/setup/doctype/territory/territory.js
View File

@@ -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) { 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' 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);
}

108
erpnext/setup/doctype/territory/territory.txt
View File

@@ -3,9 +3,9 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
'creation': '2012-03-27 14:36:25', 'creation': '2012-04-13 11:56:32',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-27 18:50:08', 'modified': '2012-05-31 11:39:33',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@@ -27,7 +27,7 @@
'section_style': u'Simple', 'section_style': u'Simple',
'server_code_error': u' ', 'server_code_error': u' ',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 87 'version': 1
}, },
# These values are common for all DocField # These values are common for all DocField
@@ -57,6 +57,56 @@
'name': u'Territory' '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 # DocPerm
{ {
'cancel': 1, 'cancel': 1,
@@ -67,56 +117,6 @@
'write': 1 '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 # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
@@ -176,7 +176,7 @@
'fieldtype': u'HTML', 'fieldtype': u'HTML',
'label': u'TerritoryHelp', 'label': u'TerritoryHelp',
'oldfieldtype': u'HTML', 'oldfieldtype': u'HTML',
'options': u'<a href="javascript:cur_frm.cscript.TerritoryHelp();">To manage Territory, click here</a>', 'options': u'<a href="#!Sales Browser/Territory">To manage Territories, click here</a>',
'permlevel': 0 'permlevel': 0
}, },

9
erpnext/stock/doctype/item/item.js
View File

@@ -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' 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 // for description from attachment
// takes the first attachment and creates // takes the first attachment and creates
// a table with both image and attachment in HTML // a table with both image and attachment in HTML

6
erpnext/stock/doctype/item/item.txt
View File

@@ -3,9 +3,9 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
'creation': '2012-04-02 16:02:29', 'creation': '2012-04-30 18:33:53',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-04-30 14:08:08', 'modified': '2012-05-31 11:18:10',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@@ -216,7 +216,7 @@
'fieldtype': u'HTML', 'fieldtype': u'HTML',
'label': u'IGHelp', 'label': u'IGHelp',
'oldfieldtype': u'HTML', 'oldfieldtype': u'HTML',
'options': u'<a href="javascript:cur_frm.cscript.IGHelp();">To manage Item Group, click here</a>', 'options': u'<a href="#!Sales Browser/Item Group">To manage Item Groups, click here</a>',
'permlevel': 0 'permlevel': 0
}, },