Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lead Organization field added in quotation

Browse Source
This commit is contained in:
Nabin Hait 2012-06-08 16:15:08 +05:30
parent be7ce4744a
commit be5e5059c3
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/selling/doctype/quotation/quotation.js
View File

@ -43,7 +43,7 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
if(doc.quotation_to) { if(doc.quotation_to) {
if(doc.quotation_to == 'Customer') { if(doc.quotation_to == 'Customer') {
hide_field(['lead', 'lead_name']); hide_field(['lead', 'lead_name', 'organization']);
} }
else if (doc.quotation_to == 'Lead') { else if (doc.quotation_to == 'Lead') {
hide_field(['customer','customer_address','contact_person', 'customer_name','contact_display', 'customer_group']); hide_field(['customer','customer_address','contact_person', 'customer_name','contact_display', 'customer_group']);
@ -64,11 +64,11 @@ cur_frm.cscript.onload_post_render = function(doc, dt, dn) {
// hide - unhide fields based on lead or customer.. // hide - unhide fields based on lead or customer..
// ======================================================================================================================= // =======================================================================================================================
cur_frm.cscript.lead_cust_show = function(doc,cdt,cdn){ cur_frm.cscript.lead_cust_show = function(doc,cdt,cdn){
hide_field(['lead', 'lead_name','customer','customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']); hide_field(['lead', 'lead_name','customer','customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group', 'organization']);
if(doc.quotation_to == 'Lead') unhide_field(['lead']); if(doc.quotation_to == 'Lead') unhide_field(['lead']);
else if(doc.quotation_to == 'Customer') unhide_field(['customer']); else if(doc.quotation_to == 'Customer') unhide_field(['customer']);
doc.lead = doc.lead_name = doc.customer = doc.customer_name = doc.customer_address = doc.contact_person = doc.address_display = doc.contact_display = doc.contact_mobile = doc.contact_email = doc.territory = doc.customer_group = ""; doc.lead = doc.lead_name = doc.customer = doc.customer_name = doc.customer_address = doc.contact_person = doc.address_display = doc.contact_display = doc.contact_mobile = doc.contact_email = doc.territory = doc.customer_group = doc.organization = "";
} }

33
erpnext/selling/doctype/quotation/quotation.txt
View File

@ -3,9 +3,9 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
'creation': '2012-05-21 11:43:59', 'creation': '2012-06-08 15:33:49',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-05-31 11:43:18', 'modified': '2012-06-08 16:10:44',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -51,7 +51,8 @@
'name': '__common__', 'name': '__common__',
'parent': u'Quotation', 'parent': u'Quotation',
'parentfield': u'permissions', 'parentfield': u'permissions',
'parenttype': u'DocType' 'parenttype': u'DocType',
'read': 1
}, },
# DocType, Quotation # DocType, Quotation
@ -60,13 +61,6 @@
'name': u'Quotation' 'name': u'Quotation'
}, },
# DocPerm
{
'doctype': u'DocPerm',
'permlevel': 0,
'role': u'user print'
},
# DocPerm # DocPerm
{ {
'amend': 0, 'amend': 0,
@ -74,7 +68,6 @@
'create': 0, 'create': 0,
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'permlevel': 1, 'permlevel': 1,
'read': 1,
'role': u'Sales Manager', 'role': u'Sales Manager',
'submit': 0, 'submit': 0,
'write': 0 'write': 0
@ -87,7 +80,6 @@
'create': 1, 'create': 1,
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'permlevel': 0, 'permlevel': 0,
'read': 1,
'role': u'Sales Manager', 'role': u'Sales Manager',
'submit': 1, 'submit': 1,
'write': 1 'write': 1
@ -100,7 +92,6 @@
'create': 1, 'create': 1,
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'permlevel': 0, 'permlevel': 0,
'read': 1,
'role': u'Sales User', 'role': u'Sales User',
'submit': 1, 'submit': 1,
'write': 1 'write': 1
@ -113,7 +104,6 @@
'create': 0, 'create': 0,
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'permlevel': 1, 'permlevel': 1,
'read': 1,
'role': u'Sales User', 'role': u'Sales User',
'submit': 0, 'submit': 0,
'write': 0 'write': 0
@ -124,7 +114,6 @@
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'match': u'customer_name', 'match': u'customer_name',
'permlevel': 0, 'permlevel': 0,
'read': 1,
'role': u'Customer' 'role': u'Customer'
}, },
@ -135,7 +124,6 @@
'create': 1, 'create': 1,
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'permlevel': 0, 'permlevel': 0,
'read': 1,
'role': u'Maintenance Manager', 'role': u'Maintenance Manager',
'submit': 1, 'submit': 1,
'write': 1 'write': 1
@ -145,7 +133,6 @@
{ {
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'permlevel': 1, 'permlevel': 1,
'read': 1,
'role': u'Maintenance Manager' 'role': u'Maintenance Manager'
}, },
@ -156,7 +143,6 @@
'create': 1, 'create': 1,
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'permlevel': 0, 'permlevel': 0,
'read': 1,
'role': u'Maintenance User', 'role': u'Maintenance User',
'submit': 1, 'submit': 1,
'write': 1 'write': 1
@ -166,7 +152,6 @@
{ {
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'permlevel': 1, 'permlevel': 1,
'read': 1,
'role': u'Maintenance User' 'role': u'Maintenance User'
}, },
@ -284,6 +269,16 @@
'permlevel': 1 'permlevel': 1
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'organization',
'fieldtype': u'Data',
'hidden': 1,
'label': u'Organization',
'permlevel': 1
},
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',