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

cleaned up lead, opportunity, jv

Browse Source
This commit is contained in:
Rushabh Mehta 2012-04-30 16:12:03 +05:30
parent 542acf6757
commit 79a664b4dc
12 changed files with 710 additions and 714 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/journal_voucher/journal_voucher.js
View File

@ -29,6 +29,10 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
cur_frm.cscript.load_defaults(doc, cdt, cdn); cur_frm.cscript.load_defaults(doc, cdt, cdn);
} }
cur_frm.cscript.refresh = function(doc) {
cur_frm.cscript.is_opening(doc)
erpnext.hide_naming_series();
}
cur_frm.cscript.load_defaults = function(doc, cdt, cdn) { cur_frm.cscript.load_defaults = function(doc, cdt, cdn) {
if(!cur_frm.doc.__islocal || !cur_frm.doc.company) { return; } if(!cur_frm.doc.__islocal || !cur_frm.doc.company) { return; }
@ -55,8 +59,6 @@ cur_frm.cscript.is_opening = function(doc, cdt, cdn) {
else hide_field('view_ledger_entry'); else hide_field('view_ledger_entry');
} }
cur_frm.cscript.refresh = cur_frm.cscript.is_opening;
cur_frm.fields_dict['entries'].grid.get_field('account').get_query = function(doc) { cur_frm.fields_dict['entries'].grid.get_field('account').get_query = function(doc) {
return "SELECT `tabAccount`.name FROM `tabAccount` WHERE `tabAccount`.company='"+doc.company+"' AND tabAccount.group_or_ledger = 'Ledger' AND tabAccount.docstatus != 2 AND `tabAccount`.%(key)s LIKE '%s' ORDER BY `tabAccount`.name DESC LIMIT 50"; return "SELECT `tabAccount`.name FROM `tabAccount` WHERE `tabAccount`.company='"+doc.company+"' AND tabAccount.group_or_ledger = 'Ledger' AND tabAccount.docstatus != 2 AND `tabAccount`.%(key)s LIKE '%s' ORDER BY `tabAccount`.name DESC LIMIT 50";
} }

446
erpnext/accounts/doctype/journal_voucher/journal_voucher.txt
View File

@ -3,9 +3,9 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
'creation': '2012-04-13 11:55:50', 'creation': '2012-04-30 12:08:36',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-04-13 12:28:24', 'modified': '2012-04-30 15:59:52',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -25,7 +25,7 @@
'show_in_menu': 0, 'show_in_menu': 0,
'subject': u' ', 'subject': u' ',
'tag_fields': u'voucher_type', 'tag_fields': u'voucher_type',
'version': 312 'version': 1
}, },
# These values are common for all DocField # These values are common for all DocField
@ -111,17 +111,6 @@
'permlevel': 0 'permlevel': 0
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'1_select_series_and_dates',
'fieldtype': u'Section Break',
'label': u'1. Select Series and Dates',
'oldfieldtype': u'Section Break',
'options': u'Simple',
'permlevel': 0
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
@ -132,49 +121,6 @@
'width': u'50%' 'width': u'50%'
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'voucher_type',
'fieldtype': u'Select',
'in_filter': 1,
'label': u'Voucher Type',
'oldfieldname': u'voucher_type',
'oldfieldtype': u'Select',
'options': u'\nJournal Entry\nBank Voucher\nCash Voucher\nCredit Card Voucher\nDebit Note\nCredit Note\nContra Voucher\nExcise Voucher\nWrite Off Voucher',
'permlevel': 0,
'print_hide': 0,
'search_index': 1
},
# DocField
{
'colour': u'White:FFF',
'depends_on': u"eval:doc.voucher_type == 'Write Off Voucher'",
'doctype': u'DocField',
'fieldname': u'write_off_amount',
'fieldtype': u'Currency',
'label': u'Write Off Amount <=',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1
},
# DocField
{
'colour': u'White:FFF',
'default': u'Accounts Receivable',
'depends_on': u"eval:doc.voucher_type == 'Write Off Voucher'",
'doctype': u'DocField',
'fieldname': u'write_off_based_on',
'fieldtype': u'Select',
'label': u'Write Off Based On',
'options': u'Accounts Receivable\nAccounts Payable',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1
},
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',
@ -194,22 +140,29 @@
# DocField # DocField
{ {
'colour': u'White:FFF',
'default': u'Today',
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'voucher_date', 'fieldname': u'voucher_type',
'fieldtype': u'Date', 'fieldtype': u'Select',
'in_filter': 1, 'in_filter': 1,
'label': u'Voucher Date', 'label': u'Voucher Type',
'no_copy': 1, 'oldfieldname': u'voucher_type',
'oldfieldname': u'voucher_date', 'oldfieldtype': u'Select',
'oldfieldtype': u'Date', 'options': u'\nJournal Entry\nBank Voucher\nCash Voucher\nCredit Card Voucher\nDebit Note\nCredit Note\nContra Voucher\nExcise Voucher\nWrite Off Voucher',
'permlevel': 0, 'permlevel': 0,
'print_hide': 0, 'print_hide': 0,
'reqd': 1,
'search_index': 1 'search_index': 1
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
},
# DocField # DocField
{ {
'description': u'The date at which current entry will get or has actually executed.', 'description': u'The date at which current entry will get or has actually executed.',
@ -229,65 +182,102 @@
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'due_date', 'fieldname': u'2_add_edit_gl_entries',
'fieldtype': u'Date', 'fieldtype': u'Section Break',
'label': u'Due Date', 'label': u'Journal Entries',
'oldfieldname': u'due_date', 'oldfieldtype': u'Section Break',
'oldfieldtype': u'Date', 'options': u'Simple',
'permlevel': 0
},
# DocField
{
'allow_on_submit': 1,
'doctype': u'DocField',
'fieldname': u'entries',
'fieldtype': u'Table',
'label': u'Entries',
'oldfieldname': u'entries',
'oldfieldtype': u'Table',
'options': u'Journal Voucher Detail',
'permlevel': 0, 'permlevel': 0,
'print_hide': 0 'print_hide': 0
}, },
# DocField # DocField
{ {
'description': u'The date at which current entry is corrected in the system.',
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'amendment_date', 'fieldname': u'section_break99',
'fieldtype': u'Date', 'fieldtype': u'Section Break',
'label': u'Amendment Date', 'options': u'Simple',
'no_copy': 1, 'permlevel': 0
'oldfieldname': u'amendment_date',
'oldfieldtype': u'Date',
'permlevel': 0,
'print_hide': 1
}, },
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'amended_from', 'fieldname': u'total_debit',
'fieldtype': u'Link', 'fieldtype': u'Currency',
'label': u'Amended From', 'in_filter': 1,
'label': u'Total Debit',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': u'amended_from', 'oldfieldname': u'total_debit',
'oldfieldtype': u'Link', 'oldfieldtype': u'Currency',
'options': u'Journal Voucher', 'permlevel': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'total_credit',
'fieldtype': u'Currency',
'in_filter': 1,
'label': u'Total Credit',
'no_copy': 1,
'oldfieldname': u'total_credit',
'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'column_break99',
'fieldtype': u'Column Break',
'permlevel': 0
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'difference',
'fieldtype': u'Currency',
'label': u'Difference',
'no_copy': 1,
'oldfieldname': u'difference',
'oldfieldtype': u'Currency',
'permlevel': 1, 'permlevel': 1,
'print_hide': 1 'print_hide': 1
}, },
# DocField # DocField
{ {
'colour': u'White:FFF',
'depends_on': u"eval:doc.voucher_type == 'Write Off Voucher'",
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'get_outstanding_invoices', 'fieldname': u'get_balance',
'fieldtype': u'Button', 'fieldtype': u'Button',
'label': u'Get Outstanding Invoices', 'label': u'Make Difference Entry',
'options': u'get_outstanding_invoices', 'oldfieldtype': u'Button',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'trigger': u'Client'
'trigger': u'Server'
}, },
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'column_break1', 'fieldname': u'reference',
'fieldtype': u'Column Break', 'fieldtype': u'Section Break',
'oldfieldtype': u'Column Break', 'label': u'Reference',
'permlevel': 0, 'permlevel': 0
'width': u'50%'
}, },
# DocField # DocField
@ -331,6 +321,14 @@
'search_index': 1 'search_index': 1
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'column_break98',
'fieldtype': u'Column Break',
'permlevel': 0
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
@ -358,101 +356,6 @@
'reqd': 0 'reqd': 0
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'2_add_edit_gl_entries',
'fieldtype': u'Section Break',
'label': u'2. Add / Edit GL Entries',
'oldfieldtype': u'Section Break',
'options': u'Simple',
'permlevel': 0
},
# DocField
{
'allow_on_submit': 1,
'doctype': u'DocField',
'fieldname': u'entries',
'fieldtype': u'Table',
'label': u'Entries',
'oldfieldname': u'entries',
'oldfieldtype': u'Table',
'options': u'Journal Voucher Detail',
'permlevel': 0,
'print_hide': 0
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'get_balance',
'fieldtype': u'Button',
'label': u'Get Balance',
'oldfieldtype': u'Button',
'permlevel': 0,
'trigger': u'Client'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'total_debit',
'fieldtype': u'Currency',
'in_filter': 1,
'label': u'Total Debit',
'no_copy': 1,
'oldfieldname': u'total_debit',
'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'total_credit',
'fieldtype': u'Currency',
'in_filter': 1,
'label': u'Total Credit',
'no_copy': 1,
'oldfieldname': u'total_credit',
'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'difference',
'fieldtype': u'Currency',
'label': u'Difference',
'no_copy': 1,
'oldfieldname': u'difference',
'oldfieldtype': u'Currency',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'addtional_info',
'fieldtype': u'Section Break',
'label': u'Addtional Info',
'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'column_break2',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
@ -477,6 +380,38 @@
'print_hide': 1 'print_hide': 1
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'due_date',
'fieldtype': u'Date',
'label': u'Due Date',
'oldfieldname': u'due_date',
'oldfieldtype': u'Date',
'permlevel': 0,
'print_hide': 0
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'addtional_info',
'fieldtype': u'Section Break',
'label': u'More Info',
'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'column_break2',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
},
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',
@ -497,6 +432,8 @@
# DocField # DocField
{ {
'colour': u'White:FFF',
'description': u'For opening invoice entry, this date will reflect in the period-wise aging report.',
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'aging_date', 'fieldname': u'aging_date',
'fieldtype': u'Date', 'fieldtype': u'Date',
@ -510,15 +447,73 @@
# DocField # DocField
{ {
'colour': u'White:FFF',
'default': u'Accounts Receivable',
'depends_on': u"eval:doc.voucher_type == 'Write Off Voucher'",
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'cancel_reason', 'fieldname': u'write_off_based_on',
'fieldtype': u'Data', 'fieldtype': u'Select',
'label': u'Cancel Reason', 'label': u'Write Off Based On',
'options': u'Accounts Receivable\nAccounts Payable',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1
},
# DocField
{
'colour': u'White:FFF',
'depends_on': u"eval:doc.voucher_type == 'Write Off Voucher'",
'doctype': u'DocField',
'fieldname': u'write_off_amount',
'fieldtype': u'Currency',
'label': u'Write Off Amount <=',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1
},
# DocField
{
'colour': u'White:FFF',
'depends_on': u"eval:doc.voucher_type == 'Write Off Voucher'",
'doctype': u'DocField',
'fieldname': u'get_outstanding_invoices',
'fieldtype': u'Button',
'label': u'Get Outstanding Invoices',
'options': u'get_outstanding_invoices',
'permlevel': 0,
'print_hide': 1,
'trigger': u'Server'
},
# DocField
{
'colour': u'White:FFF',
'default': u'Today',
'description': u'Date of entry (not posting to ledgers)',
'doctype': u'DocField',
'fieldname': u'voucher_date',
'fieldtype': u'Date',
'in_filter': 1,
'label': u'Voucher Date',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': u'cancel_reason', 'oldfieldname': u'voucher_date',
'oldfieldtype': u'Data', 'oldfieldtype': u'Date',
'permlevel': 1, 'permlevel': 0,
'print_hide': 1 'print_hide': 0,
'reqd': 1,
'search_index': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'column_break3',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
}, },
# DocField # DocField
@ -560,16 +555,6 @@
'report_hide': 1 'report_hide': 1
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'column_break3',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
@ -620,6 +605,47 @@
'trigger': u'Client' 'trigger': u'Client'
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'amended_from',
'fieldtype': u'Link',
'label': u'Amended From',
'no_copy': 1,
'oldfieldname': u'amended_from',
'oldfieldtype': u'Link',
'options': u'Journal Voucher',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
'description': u'The date at which current entry is corrected in the system.',
'doctype': u'DocField',
'fieldname': u'amendment_date',
'fieldtype': u'Date',
'label': u'Amendment Date',
'no_copy': 1,
'oldfieldname': u'amendment_date',
'oldfieldtype': u'Date',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'cancel_reason',
'fieldtype': u'Data',
'label': u'Cancel Reason',
'no_copy': 1,
'oldfieldname': u'cancel_reason',
'oldfieldtype': u'Data',
'permlevel': 1,
'print_hide': 1
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',

62
erpnext/accounts/doctype/journal_voucher_detail/journal_voucher_detail.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:43', 'creation': '2012-04-02 16:01:23',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-27 14:35:43', 'modified': '2012-04-30 16:05:46',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -22,7 +22,7 @@
'section_style': u'Tray', 'section_style': u'Tray',
'server_code_error': u' ', 'server_code_error': u' ',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 3 'version': 1
}, },
# These values are common for all DocField # These values are common for all DocField
@ -54,34 +54,7 @@
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 1,
'trigger': u'Client', 'trigger': u'Client',
'width': u'180px' 'width': u'250px'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'cost_center',
'fieldtype': u'Link',
'in_filter': 1,
'label': u'Cost Center',
'oldfieldname': u'cost_center',
'oldfieldtype': u'Link',
'options': u'Cost Center',
'permlevel': 0,
'search_index': 0,
'width': u'180px'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'balance',
'fieldtype': u'Data',
'label': u'Balance',
'no_copy': 1,
'oldfieldname': u'balance',
'oldfieldtype': u'Data',
'permlevel': 1
}, },
# DocField # DocField
@ -108,6 +81,33 @@
'trigger': u'Client' 'trigger': u'Client'
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'cost_center',
'fieldtype': u'Link',
'in_filter': 1,
'label': u'Cost Center',
'oldfieldname': u'cost_center',
'oldfieldtype': u'Link',
'options': u'Cost Center',
'permlevel': 0,
'search_index': 0,
'width': u'180px'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'balance',
'fieldtype': u'Data',
'label': u'Account Balance',
'no_copy': 1,
'oldfieldname': u'balance',
'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',

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

@ -51,6 +51,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) {
cur_frm.add_custom_button('Create Opportunity', cur_frm.cscript['Create Opportunity']); cur_frm.add_custom_button('Create Opportunity', cur_frm.cscript['Create Opportunity']);
cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms);
} }
erpnext.hide_naming_series();
} }

2
erpnext/selling/doctype/lead/lead.py
View File

@ -175,7 +175,7 @@ Cheers!
ev = Document('Event') ev = Document('Event')
ev.owner = in_calendar_of ev.owner = in_calendar_of
ev.description = 'Contact ' + cstr(self.doc.lead_name) + '.By : ' + cstr(self.doc.contact_by) + '.To Discuss : ' + cstr(self.doc.to_discuss) ev.description = 'Contact ' + cstr(self.doc.lead_name) + '.By : ' + cstr(self.doc.contact_by) + '.To Discuss : ' + cstr(self.doc.remark)
ev.event_date = self.doc.contact_date ev.event_date = self.doc.contact_date
ev.event_hour = '10:00' ev.event_hour = '10:00'
ev.event_type = 'Private' ev.event_type = 'Private'

289
erpnext/selling/doctype/lead/lead.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:10', 'creation': '2012-04-02 16:02:08',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-27 14:36:10', 'modified': '2012-04-30 15:20:50',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -26,7 +26,7 @@
'show_in_menu': 0, 'show_in_menu': 0,
'subject': u'%(lead_name)s from %(company_name)s | To Discuss: %(to_discuss)s', 'subject': u'%(lead_name)s from %(company_name)s | To Discuss: %(to_discuss)s',
'tag_fields': u'status,source', 'tag_fields': u'status,source',
'version': 395 'version': 1
}, },
# These values are common for all DocField # These values are common for all DocField
@ -56,21 +56,26 @@
# DocPerm # DocPerm
{ {
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'permlevel': 1, 'permlevel': 1,
'role': u'All' 'role': u'Sales User',
'submit': 0,
'write': 0
}, },
# DocPerm # DocPerm
{ {
'amend': 0, 'amend': 0,
'cancel': 0, 'cancel': 0,
'create': 1, 'create': 0,
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'permlevel': 0, 'permlevel': 1,
'role': u'Sales User', 'role': u'Sales Manager',
'submit': 0, 'submit': 0,
'write': 1 'write': 0
}, },
# DocPerm # DocPerm
@ -91,44 +96,28 @@
'cancel': 0, 'cancel': 0,
'create': 1, 'create': 1,
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'match': u'owner',
'permlevel': 0, 'permlevel': 0,
'role': u'System Manager', 'role': u'Sales User',
'submit': 0, 'submit': 0,
'write': 1 'write': 1
}, },
# DocPerm # DocPerm
{ {
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'permlevel': 1, 'permlevel': 1,
'role': u'Sales Manager', 'role': u'All'
'submit': 0,
'write': 0
}, },
# DocPerm # DocPerm
{ {
'amend': 0, 'amend': 0,
'cancel': 0, 'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Sales User',
'submit': 0,
'write': 0
},
# DocPerm
{
'create': 1, 'create': 1,
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'match': u'territory',
'permlevel': 0, 'permlevel': 0,
'role': u'System Manager', 'role': u'System Manager',
'submit': 0,
'write': 1 'write': 1
}, },
@ -162,6 +151,22 @@
'width': u'50%' 'width': u'50%'
}, },
# DocField
{
'colour': u'White:FFF',
'description': u'To manage multiple series please go to Setup > Manage Series',
'doctype': u'DocField',
'fieldname': u'naming_series',
'fieldtype': u'Select',
'label': u'Naming Series',
'no_copy': 1,
'oldfieldname': u'naming_series',
'oldfieldtype': u'Select',
'options': u'LEAD\nLEAD/10-11/\nLEAD/MUMBAI/',
'permlevel': 0,
'reqd': 0
},
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',
@ -177,6 +182,23 @@
'search_index': 1 'search_index': 1
}, },
# DocField
{
'colour': u'White:FFF',
'description': u'Name of organization from where lead has come',
'doctype': u'DocField',
'fieldname': u'company_name',
'fieldtype': u'Data',
'in_filter': 1,
'label': u'Company Name',
'oldfieldname': u'company_name',
'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 0,
'search_index': 0,
'trigger': u'Client'
},
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',
@ -228,35 +250,11 @@
# DocField # DocField
{ {
'colour': u'White:FFF',
'description': u'Name of organization from where lead has come',
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'company_name', 'fieldname': u'column_break1',
'fieldtype': u'Data', 'fieldtype': u'Column Break',
'in_filter': 1,
'label': u'Company Name',
'oldfieldname': u'company_name',
'oldfieldtype': u'Data',
'permlevel': 0, 'permlevel': 0,
'reqd': 0, 'width': u'50%'
'search_index': 0,
'trigger': u'Client'
},
# DocField
{
'colour': u'White:FFF',
'description': u'To manage multiple series please go to Setup > Manage Series',
'doctype': u'DocField',
'fieldname': u'naming_series',
'fieldtype': u'Select',
'label': u'Series',
'no_copy': 1,
'oldfieldname': u'naming_series',
'oldfieldtype': u'Select',
'options': u'LEAD\nLEAD/10-11/\nLEAD/MUMBAI/',
'permlevel': 0,
'reqd': 0
}, },
# DocField # DocField
@ -278,32 +276,6 @@
'trigger': u'Client' 'trigger': u'Client'
}, },
# DocField
{
'default': u'Today',
'description': u'The date at which current entry is made in system.',
'doctype': u'DocField',
'fieldname': u'transaction_date',
'fieldtype': u'Date',
'in_filter': 1,
'label': u'Lead Date',
'no_copy': 1,
'oldfieldname': u'transaction_date',
'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1,
'search_index': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
},
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',
@ -318,35 +290,6 @@
'permlevel': 0 'permlevel': 0
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'request_type',
'fieldtype': u'Select',
'label': u'Request Type',
'oldfieldname': u'request_type',
'oldfieldtype': u'Select',
'options': u'\nProduct Enquiry\nRequest for Information\nSuggestions\nOther',
'permlevel': 0
},
# DocField
{
'colour': u'White:FFF',
'description': u'Probability of lead converting to customer',
'doctype': u'DocField',
'fieldname': u'rating',
'fieldtype': u'Select',
'in_filter': 1,
'label': u'Rating',
'oldfieldname': u'rating',
'oldfieldtype': u'Select',
'options': u'\nHot\nWarm\nCold',
'permlevel': 0,
'reqd': 0,
'search_index': 0
},
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',
@ -361,30 +304,24 @@
# DocField # DocField
{ {
'allow_on_submit': 0,
'depends_on': u"eval:doc.status == 'Lead Lost'",
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'order_lost_reason', 'fieldname': u'communication_history',
'fieldtype': u'Link', 'fieldtype': u'Section Break',
'hidden': 0, 'label': u'Communication History',
'label': u'Lost Reason',
'oldfieldname': u'order_lost_reason',
'oldfieldtype': u'Link',
'options': u'Quotation Lost Reason',
'permlevel': 0 'permlevel': 0
}, },
# DocField # DocField
{ {
'allow_on_submit': 0,
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'trash_reason', 'fieldname': u'follow_up',
'fieldtype': u'Small Text', 'fieldtype': u'Table',
'label': u'Trash Reason', 'label': u'Communication Log',
'no_copy': 1, 'oldfieldname': u'follow_up',
'oldfieldname': u'trash_reason', 'oldfieldtype': u'Table',
'oldfieldtype': u'Small Text', 'options': u'Communication Log',
'permlevel': 1, 'permlevel': 0
'print_hide': 1
}, },
# DocField # DocField
@ -407,7 +344,7 @@
'oldfieldname': u'contact_no', 'oldfieldname': u'contact_no',
'oldfieldtype': u'Data', 'oldfieldtype': u'Data',
'permlevel': 0, 'permlevel': 0,
'reqd': 1 'reqd': 0
}, },
# DocField # DocField
@ -513,7 +450,7 @@
'oldfieldtype': u'Select', 'oldfieldtype': u'Select',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1 'reqd': 0
}, },
# DocField # DocField
@ -527,7 +464,7 @@
'options': u'link:Country', 'options': u'link:Country',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 0,
'trigger': u'Client' 'trigger': u'Client'
}, },
@ -570,15 +507,19 @@
# DocField # DocField
{ {
'colour': u'White:FFF',
'description': u'Probability of lead converting to customer',
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'company', 'fieldname': u'rating',
'fieldtype': u'Link', 'fieldtype': u'Select',
'label': u'Company', 'in_filter': 1,
'oldfieldname': u'company', 'label': u'Rating',
'oldfieldtype': u'Link', 'oldfieldname': u'rating',
'options': u'Company', 'oldfieldtype': u'Select',
'options': u'\nHot\nWarm\nCold',
'permlevel': 0, 'permlevel': 0,
'reqd': 1 'reqd': 0,
'search_index': 0
}, },
# DocField # DocField
@ -626,14 +567,13 @@
# DocField # DocField
{ {
'colour': u'White:FFF',
'description': u'Your products or facilities in which the lead is interested',
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'interested_in', 'fieldname': u'request_type',
'fieldtype': u'Data', 'fieldtype': u'Select',
'label': u'Interested In', 'label': u'Request Type',
'oldfieldname': u'interested_in', 'oldfieldname': u'request_type',
'oldfieldtype': u'Data', 'oldfieldtype': u'Select',
'options': u'\nProduct Enquiry\nRequest for Information\nSuggestions\nOther',
'permlevel': 0 'permlevel': 0
}, },
@ -661,6 +601,21 @@
'width': u'50%' 'width': u'50%'
}, },
# DocField
{
'allow_on_submit': 0,
'depends_on': u"eval:doc.status == 'Lead Lost'",
'doctype': u'DocField',
'fieldname': u'order_lost_reason',
'fieldtype': u'Link',
'hidden': 0,
'label': u'Lost Reason',
'oldfieldname': u'order_lost_reason',
'oldfieldtype': u'Link',
'options': u'Quotation Lost Reason',
'permlevel': 0
},
# DocField # DocField
{ {
'allow_on_submit': 0, 'allow_on_submit': 0,
@ -717,39 +672,27 @@
# DocField # DocField
{ {
'allow_on_submit': 0,
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'to_discuss', 'fieldname': u'company',
'fieldtype': u'Link',
'label': u'Company',
'oldfieldname': u'company',
'oldfieldtype': u'Link',
'options': u'Company',
'permlevel': 0,
'reqd': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'trash_reason',
'fieldtype': u'Small Text', 'fieldtype': u'Small Text',
'label': u'To Discuss', 'label': u'Trash Reason',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': u'to_discuss', 'oldfieldname': u'trash_reason',
'oldfieldtype': u'Small Text', 'oldfieldtype': u'Small Text',
'permlevel': 0 'permlevel': 1,
}, 'print_hide': 1
# DocField
{
'colour': u'White:FFF',
'description': u'Keep a track of communication with this lead which will help for future reference.',
'doctype': u'DocField',
'fieldname': u'communication_history',
'fieldtype': u'Section Break',
'label': u'Communication History',
'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
'allow_on_submit': 0,
'doctype': u'DocField',
'fieldname': u'follow_up',
'fieldtype': u'Table',
'label': u'Communication Log',
'oldfieldname': u'follow_up',
'oldfieldtype': u'Table',
'options': u'Communication Log',
'permlevel': 0
} }
] ]

12
erpnext/selling/doctype/opportunity/opportunity.js
View File

@ -17,16 +17,7 @@
wn.require('erpnext/utilities/doctype/sms_control/sms_control.js'); wn.require('erpnext/utilities/doctype/sms_control/sms_control.js');
cur_frm.cscript.refresh = function(doc, cdt, cdn){ cur_frm.cscript.refresh = function(doc, cdt, cdn){
erpnext.hide_naming_series();
//
if(!doc.docstatus){
hide_field(['email_id1','cc_to','subject','message', 'enquiry_attachment_detail']);
}
else{
unhide_field(['email_id1','cc_to','subject','message', 'enquiry_attachment_detail']);
}
cur_frm.clear_custom_buttons(); cur_frm.clear_custom_buttons();
if(doc.docstatus == 1) { if(doc.docstatus == 1) {
@ -35,7 +26,6 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn){
cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms);
} }
//cur_frm.cscript.clear_values(doc,cdt,cdn);
} }
// ONLOAD // ONLOAD

451
erpnext/selling/doctype/opportunity/opportunity.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:08', 'creation': '2012-04-02 16:02:08',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-27 14:45:47', 'modified': '2012-04-30 15:34:34',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -25,7 +25,7 @@
'server_code_error': u' ', 'server_code_error': u' ',
'show_in_menu': 0, 'show_in_menu': 0,
'subject': u'To %(customer_name)s%(lead_name)s on %(transaction_date)s', 'subject': u'To %(customer_name)s%(lead_name)s on %(transaction_date)s',
'version': 588 'version': 1
}, },
# These values are common for all DocField # These values are common for all DocField
@ -53,6 +53,18 @@
'name': u'Opportunity' 'name': u'Opportunity'
}, },
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Sales Manager',
'submit': 0,
'write': 0
},
# DocPerm # DocPerm
{ {
'amend': 1, 'amend': 1,
@ -108,18 +120,6 @@
'write': 1 'write': 1
}, },
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Sales Manager',
'submit': 0,
'write': 0
},
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',
@ -139,7 +139,7 @@
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'naming_series', 'fieldname': u'naming_series',
'fieldtype': u'Select', 'fieldtype': u'Select',
'label': u'Series', 'label': u'Naming Series',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': u'naming_series', 'oldfieldname': u'naming_series',
'oldfieldtype': u'Select', 'oldfieldtype': u'Select',
@ -184,42 +184,6 @@
'trigger': u'Client' 'trigger': u'Client'
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'customer_address',
'fieldtype': u'Link',
'in_filter': 1,
'label': u'Customer Address',
'options': u'Address',
'permlevel': 0,
'print_hide': 1,
'trigger': u'Client'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'contact_person',
'fieldtype': u'Link',
'in_filter': 1,
'label': u'Contact Person',
'options': u'Contact',
'permlevel': 0,
'print_hide': 1,
'trigger': u'Client'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'customer_name',
'fieldtype': u'Data',
'label': u'Customer Name',
'permlevel': 1,
'print_hide': 0
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
@ -236,57 +200,6 @@
'trigger': u'Client' 'trigger': u'Client'
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'lead_name',
'fieldtype': u'Data',
'hidden': 0,
'label': u'Name',
'oldfieldname': u'lead_name',
'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'address_display',
'fieldtype': u'Small Text',
'hidden': 0,
'label': u'Address',
'oldfieldname': u'address',
'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'contact_display',
'fieldtype': u'Small Text',
'label': u'Contact',
'permlevel': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'contact_mobile',
'fieldtype': u'Text',
'label': u'Contact Mobile No',
'permlevel': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'contact_email',
'fieldtype': u'Text',
'label': u'Contact Email',
'permlevel': 1
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
@ -297,35 +210,6 @@
'width': u'50%' 'width': u'50%'
}, },
# DocField
{
'default': u'Today',
'description': u'The date at which current entry is made in system.',
'doctype': u'DocField',
'fieldname': u'transaction_date',
'fieldtype': u'Date',
'label': u'Opportunity Date',
'oldfieldname': u'transaction_date',
'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1,
'width': u'50px'
},
# DocField
{
'colour': u'White:FFF',
'doctype': u'DocField',
'fieldname': u'enquiry_type',
'fieldtype': u'Select',
'label': u'Opportunity Type',
'oldfieldname': u'enquiry_type',
'oldfieldtype': u'Select',
'options': u'\nSales\nMaintenance',
'permlevel': 0,
'reqd': 1
},
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',
@ -342,70 +226,18 @@
'reqd': 1 'reqd': 1
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'amended_from',
'fieldtype': u'Data',
'label': u'Amended From',
'no_copy': 1,
'oldfieldname': u'amended_from',
'oldfieldtype': u'Data',
'permlevel': 1,
'print_hide': 1,
'width': u'150px'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'amendment_date',
'fieldtype': u'Date',
'label': u'Amendment Date',
'no_copy': 1,
'oldfieldname': u'amendment_date',
'oldfieldtype': u'Date',
'permlevel': 1,
'print_hide': 1,
'width': u'150px'
},
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',
'description': u'<a href="javascript:cur_frm.cscript.TerritoryHelp();">To Manage Territory, click here</a>',
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'territory', 'fieldname': u'enquiry_type',
'fieldtype': u'Link', 'fieldtype': u'Select',
'in_filter': 1, 'label': u'Opportunity Type',
'label': u'Territory', 'oldfieldname': u'enquiry_type',
'options': u'Territory', 'oldfieldtype': u'Select',
'options': u'\nSales\nMaintenance',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'reqd': 1
'reqd': 0,
'search_index': 1,
'trigger': u'Client'
},
# DocField
{
'colour': u'White:FFF',
'depends_on': u'eval:doc.enquiry_from=="Customer"',
'description': u'<a href="javascript:cur_frm.cscript.CGHelp();">To Manage Customer Groups, click here</a>',
'doctype': u'DocField',
'fieldname': u'customer_group',
'fieldtype': u'Link',
'hidden': 0,
'in_filter': 1,
'label': u'Customer Group',
'oldfieldname': u'customer_group',
'oldfieldtype': u'Link',
'options': u'Customer Group',
'permlevel': 0,
'print_hide': 1,
'reqd': 0,
'search_index': 1,
'trigger': u'Client'
}, },
# DocField # DocField
@ -433,6 +265,174 @@
'permlevel': 0 'permlevel': 0
}, },
# DocField
{
'colour': u'White:FFF',
'description': u'Keep a track of communication related to this enquiry which will help for future reference.',
'doctype': u'DocField',
'fieldname': u'communication_history',
'fieldtype': u'Section Break',
'label': u'Communication History',
'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
'allow_on_submit': 1,
'colour': u'White:FFF',
'doctype': u'DocField',
'fieldname': u'follow_up',
'fieldtype': u'Table',
'label': u'Communication Log',
'oldfieldname': u'follow_up',
'oldfieldtype': u'Table',
'options': u'Communication Log',
'permlevel': 0
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'contact_info',
'fieldtype': u'Section Break',
'label': u'Contact Info',
'permlevel': 0
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'contact_person',
'fieldtype': u'Link',
'in_filter': 1,
'label': u'Contact Person',
'options': u'Contact',
'permlevel': 0,
'print_hide': 1,
'trigger': u'Client'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'customer_address',
'fieldtype': u'Link',
'in_filter': 1,
'label': u'Customer Address',
'options': u'Address',
'permlevel': 0,
'print_hide': 1,
'trigger': u'Client'
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'customer_name',
'fieldtype': u'Data',
'label': u'Customer Name',
'permlevel': 1,
'print_hide': 0
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'address_display',
'fieldtype': u'Small Text',
'hidden': 0,
'label': u'Address',
'oldfieldname': u'address',
'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'column_break3',
'fieldtype': u'Column Break',
'permlevel': 0
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'contact_display',
'fieldtype': u'Small Text',
'label': u'Contact',
'permlevel': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'contact_email',
'fieldtype': u'Text',
'label': u'Contact Email',
'permlevel': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'contact_mobile',
'fieldtype': u'Text',
'label': u'Contact Mobile No',
'permlevel': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'lead_name',
'fieldtype': u'Data',
'hidden': 0,
'label': u'Name',
'oldfieldname': u'lead_name',
'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
'colour': u'White:FFF',
'depends_on': u'eval:doc.enquiry_from=="Customer"',
'description': u'<a href="javascript:cur_frm.cscript.CGHelp();">To Manage Customer Groups, click here</a>',
'doctype': u'DocField',
'fieldname': u'customer_group',
'fieldtype': u'Link',
'hidden': 0,
'in_filter': 1,
'label': u'Customer Group',
'oldfieldname': u'customer_group',
'oldfieldtype': u'Link',
'options': u'Customer Group',
'permlevel': 0,
'print_hide': 1,
'reqd': 0,
'search_index': 1,
'trigger': u'Client'
},
# DocField
{
'colour': u'White:FFF',
'description': u'<a href="javascript:cur_frm.cscript.TerritoryHelp();">To Manage Territory, click here</a>',
'doctype': u'DocField',
'fieldname': u'territory',
'fieldtype': u'Link',
'in_filter': 1,
'label': u'Territory',
'options': u'Territory',
'permlevel': 0,
'print_hide': 1,
'reqd': 0,
'search_index': 1,
'trigger': u'Client'
},
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',
@ -457,18 +457,17 @@
# DocField # DocField
{ {
'default': u'Today',
'description': u'The date at which current entry is made in system.',
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'company', 'fieldname': u'transaction_date',
'fieldtype': u'Link', 'fieldtype': u'Date',
'in_filter': 1, 'label': u'Opportunity Date',
'label': u'Company', 'oldfieldname': u'transaction_date',
'oldfieldname': u'company', 'oldfieldtype': u'Date',
'oldfieldtype': u'Link',
'options': u'Company',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'width': u'50px'
}, },
# DocField # DocField
@ -528,6 +527,22 @@
'report_hide': 0 'report_hide': 0
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'company',
'fieldtype': u'Link',
'in_filter': 1,
'label': u'Company',
'oldfieldname': u'company',
'oldfieldtype': u'Link',
'options': u'Company',
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
'search_index': 1
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
@ -598,27 +613,29 @@
# DocField # DocField
{ {
'colour': u'White:FFF',
'description': u'Keep a track of communication related to this enquiry which will help for future reference.',
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'communication_history', 'fieldname': u'amended_from',
'fieldtype': u'Section Break', 'fieldtype': u'Data',
'label': u'Communication History', 'label': u'Amended From',
'oldfieldtype': u'Section Break', 'no_copy': 1,
'permlevel': 0 'oldfieldname': u'amended_from',
'oldfieldtype': u'Data',
'permlevel': 1,
'print_hide': 1,
'width': u'150px'
}, },
# DocField # DocField
{ {
'allow_on_submit': 1,
'colour': u'White:FFF',
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'follow_up', 'fieldname': u'amendment_date',
'fieldtype': u'Table', 'fieldtype': u'Date',
'label': u'Follow Up', 'label': u'Amendment Date',
'oldfieldname': u'follow_up', 'no_copy': 1,
'oldfieldtype': u'Table', 'oldfieldname': u'amendment_date',
'options': u'Communication Log', 'oldfieldtype': u'Date',
'permlevel': 0 'permlevel': 1,
'print_hide': 1,
'width': u'150px'
} }
] ]

140
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-03-27 14:36:12', 'creation': '2012-04-02 16:02:08',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-27 18:48:29', 'modified': '2012-04-30 15:41:16',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -33,7 +33,7 @@
'show_in_menu': 0, 'show_in_menu': 0,
'subject': u'To %(customer_name)s on %(transaction_date)s worth %(currency)s %(grand_total_export)s', 'subject': u'To %(customer_name)s on %(transaction_date)s worth %(currency)s %(grand_total_export)s',
'tag_fields': u'status', 'tag_fields': u'status',
'version': 622 'version': 1
}, },
# These values are common for all DocField # These values are common for all DocField
@ -51,8 +51,7 @@
'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
@ -61,6 +60,26 @@
'name': u'Quotation' 'name': u'Quotation'
}, },
# DocPerm
{
'doctype': u'DocPerm',
'permlevel': 0,
'role': u'user print'
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
'read': 1,
'role': u'Sales Manager',
'submit': 0,
'write': 0
},
# DocPerm # DocPerm
{ {
'amend': 1, 'amend': 1,
@ -68,6 +87,20 @@
'create': 1, 'create': 1,
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'permlevel': 0, 'permlevel': 0,
'read': 1,
'role': u'Sales Manager',
'submit': 1,
'write': 1
},
# DocPerm
{
'amend': 1,
'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
'permlevel': 0,
'read': 1,
'role': u'Sales User', 'role': u'Sales User',
'submit': 1, 'submit': 1,
'write': 1 'write': 1
@ -80,6 +113,7 @@
'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
@ -90,33 +124,10 @@
'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'
}, },
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Sales Manager',
'submit': 0,
'write': 0
},
# DocPerm
{
'amend': 1,
'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
'permlevel': 0,
'role': u'Sales Manager',
'submit': 1,
'write': 1
},
# DocPerm # DocPerm
{ {
'amend': 1, 'amend': 1,
@ -124,6 +135,7 @@
'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
@ -133,6 +145,7 @@
{ {
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'permlevel': 1, 'permlevel': 1,
'read': 1,
'role': u'Maintenance Manager' 'role': u'Maintenance Manager'
}, },
@ -143,6 +156,7 @@
'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
@ -152,6 +166,7 @@
{ {
'doctype': u'DocPerm', 'doctype': u'DocPerm',
'permlevel': 1, 'permlevel': 1,
'read': 1,
'role': u'Maintenance User' 'role': u'Maintenance User'
}, },
@ -183,7 +198,7 @@
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'naming_series', 'fieldname': u'naming_series',
'fieldtype': u'Select', 'fieldtype': u'Select',
'label': u'Series', 'label': u'Naming Series',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': u'naming_series', 'oldfieldname': u'naming_series',
'oldfieldtype': u'Select', 'oldfieldtype': u'Select',
@ -286,7 +301,7 @@
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'lead_name', 'fieldname': u'lead_name',
'fieldtype': u'Text', 'fieldtype': u'Text',
'label': u'Name', 'label': u'Lead Name',
'permlevel': 1 'permlevel': 1
}, },
@ -295,16 +310,7 @@
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'customer_name', 'fieldname': u'customer_name',
'fieldtype': u'Data', 'fieldtype': u'Data',
'label': u'Name', 'label': u'Customer Name',
'permlevel': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'organization',
'fieldtype': u'Data',
'label': u'Organization',
'permlevel': 1 'permlevel': 1
}, },
@ -505,6 +511,31 @@
'search_index': 0 'search_index': 0
}, },
# DocField
{
'allow_on_submit': 1,
'colour': u'White:FFF',
'doctype': u'DocField',
'fieldname': u'quotation_details',
'fieldtype': u'Table',
'label': u'Quotation Items',
'oldfieldname': u'quotation_details',
'oldfieldtype': u'Table',
'options': u'Quotation Item',
'permlevel': 0,
'width': u'40px'
},
# DocField
{
'colour': u'White:FFF',
'doctype': u'DocField',
'fieldname': u'section_break0',
'fieldtype': u'Section Break',
'options': u'Simple',
'permlevel': 0
},
# DocField # DocField
{ {
'colour': u'White:FFF', 'colour': u'White:FFF',
@ -634,31 +665,6 @@
'trigger': u'Client' 'trigger': u'Client'
}, },
# DocField
{
'colour': u'White:FFF',
'doctype': u'DocField',
'fieldname': u'section_break0',
'fieldtype': u'Section Break',
'options': u'Simple',
'permlevel': 0
},
# DocField
{
'allow_on_submit': 1,
'colour': u'White:FFF',
'doctype': u'DocField',
'fieldname': u'quotation_details',
'fieldtype': u'Table',
'label': u'Quotation Items',
'oldfieldname': u'quotation_details',
'oldfieldtype': u'Table',
'options': u'Quotation Item',
'permlevel': 0,
'width': u'40px'
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
@ -1225,4 +1231,4 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1 'print_hide': 1
} }
] ]

9
erpnext/startup/startup.js
View File

@ -215,3 +215,12 @@ erpnext.send_message = function(opts) {
} }
}); });
} }
erpnext.hide_naming_series = function() {
if(cur_frm.fields_dict.naming_series) {
hide_field('naming_series');
if(cur_frm.doc.__islocal) {
unhide_field('naming_series');
}
}
}

3
js/all-app.js
View File

@ -2234,7 +2234,7 @@ if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settin
if(wn.boot.startup_code){eval(wn.boot.startup_code);}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages']) if(wn.boot.startup_code){eval(wn.boot.startup_code);}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages'])
if(user_roles.indexOf('Accounts Manager')!=-1){wn.boot.profile.allow_modules.push('Dashboard');} if(user_roles.indexOf('Accounts Manager')!=-1){wn.boot.profile.allow_modules.push('Dashboard');}
erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup.show();} erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup.show();}
if(wn.boot.expires_on){var today=dateutil.str_to_obj(dateutil.get_today());var expires_on=dateutil.str_to_obj(wn.boot.expires_on);var diff=dateutil.get_diff(expires_on,today);if(0<=diff&&diff<=15){var expiry_string=diff==0?"today":repl("in %(diff)s day(s)",{diff:diff});$('header').append(repl('<div class="expiry-info"> \ if(wn.boot.expires_on&&in_list(user_roles,'System Manager')){var today=dateutil.str_to_obj(dateutil.get_today());var expires_on=dateutil.str_to_obj(wn.boot.expires_on);var diff=dateutil.get_diff(expires_on,today);if(0<=diff&&diff<=15){var expiry_string=diff==0?"today":repl("in %(diff)s day(s)",{diff:diff});$('header').append(repl('<div class="expiry-info"> \
Ahem! Your ERPNext subscription will <b>expire %(expiry_string)s</b>. \ Ahem! Your ERPNext subscription will <b>expire %(expiry_string)s</b>. \
Please renew your subscription to continue using ERPNext \ Please renew your subscription to continue using ERPNext \
(and remove this annoying banner). \ (and remove this annoying banner). \
@ -2256,6 +2256,7 @@ erpnext.set_user_background=function(src){set_style(repl('#body_div { background
$(document).bind('startup',function(){erpnext.startup.start();});erpnext.send_message=function(opts){if(opts.btn){$(opts.btn).start_working();} $(document).bind('startup',function(){erpnext.startup.start();});erpnext.send_message=function(opts){if(opts.btn){$(opts.btn).start_working();}
wn.call({method:'website.send_message',args:opts,callback:function(r){if(opts.btn){$(opts.btn).done_working();} wn.call({method:'website.send_message',args:opts,callback:function(r){if(opts.btn){$(opts.btn).done_working();}
if(opts.callback)opts.callback(r)}});} if(opts.callback)opts.callback(r)}});}
erpnext.hide_naming_series=function(){console.log(1);if(cur_frm.fields_dict.naming_series){hide_field('naming_series');if(cur_frm.doc.__islocal){unhide_field('naming_series');}}}
/* /*
* erpnext/startup/js/modules.js * erpnext/startup/js/modules.js
*/ */

3
js/all-web.js
View File

@ -843,7 +843,7 @@ if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settin
if(wn.boot.startup_code){eval(wn.boot.startup_code);}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages']) if(wn.boot.startup_code){eval(wn.boot.startup_code);}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages'])
if(user_roles.indexOf('Accounts Manager')!=-1){wn.boot.profile.allow_modules.push('Dashboard');} if(user_roles.indexOf('Accounts Manager')!=-1){wn.boot.profile.allow_modules.push('Dashboard');}
erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup.show();} erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup.show();}
if(wn.boot.expires_on){var today=dateutil.str_to_obj(dateutil.get_today());var expires_on=dateutil.str_to_obj(wn.boot.expires_on);var diff=dateutil.get_diff(expires_on,today);if(0<=diff&&diff<=15){var expiry_string=diff==0?"today":repl("in %(diff)s day(s)",{diff:diff});$('header').append(repl('<div class="expiry-info"> \ if(wn.boot.expires_on&&in_list(user_roles,'System Manager')){var today=dateutil.str_to_obj(dateutil.get_today());var expires_on=dateutil.str_to_obj(wn.boot.expires_on);var diff=dateutil.get_diff(expires_on,today);if(0<=diff&&diff<=15){var expiry_string=diff==0?"today":repl("in %(diff)s day(s)",{diff:diff});$('header').append(repl('<div class="expiry-info"> \
Ahem! Your ERPNext subscription will <b>expire %(expiry_string)s</b>. \ Ahem! Your ERPNext subscription will <b>expire %(expiry_string)s</b>. \
Please renew your subscription to continue using ERPNext \ Please renew your subscription to continue using ERPNext \
(and remove this annoying banner). \ (and remove this annoying banner). \
@ -865,6 +865,7 @@ erpnext.set_user_background=function(src){set_style(repl('#body_div { background
$(document).bind('startup',function(){erpnext.startup.start();});erpnext.send_message=function(opts){if(opts.btn){$(opts.btn).start_working();} $(document).bind('startup',function(){erpnext.startup.start();});erpnext.send_message=function(opts){if(opts.btn){$(opts.btn).start_working();}
wn.call({method:'website.send_message',args:opts,callback:function(r){if(opts.btn){$(opts.btn).done_working();} wn.call({method:'website.send_message',args:opts,callback:function(r){if(opts.btn){$(opts.btn).done_working();}
if(opts.callback)opts.callback(r)}});} if(opts.callback)opts.callback(r)}});}
erpnext.hide_naming_series=function(){console.log(1);if(cur_frm.fields_dict.naming_series){hide_field('naming_series');if(cur_frm.doc.__islocal){unhide_field('naming_series');}}}
/* /*
* erpnext/website/js/topbar.js * erpnext/website/js/topbar.js
*/ */