nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1209' of github.com:webnotes/erpnext into 1209

Browse Source
This commit is contained in:
Anand Doshi
2012-09-28 12:39:37 +05:30
parent 8bde7cb8db 534a7a92fe
commit b83307823b
12 changed files with 209 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
selling/doctype/customer/customer.txt
View File

@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
u'creation': '2012-07-18 20:34:41',
u'creation': '2012-09-21 09:56:34',
u'docstatus': 0,
u'modified': '2012-09-17 11:31:55',
u'modified': '2012-09-28 12:31:42',
u'modified_by': u'Administrator',
u'owner': u'Administrator'
},
@@ -454,23 +454,13 @@
# DocPerm
{
'amend': 0,
'cancel': 1,
'create': 1,
'cancel': 0,
'create': 0,
u'doctype': u'DocPerm',
'permlevel': 0,
'role': u'Sales Master Manager',
'permlevel': 1,
'role': u'Sales Manager',
'submit': 0,
'write': 1
},
# DocPerm
{
'cancel': 1,
'create': 1,
u'doctype': u'DocPerm',
'permlevel': 0,
'role': u'Accounts Manager',
'write': 1
'write': 0
},
# DocPerm
@@ -491,7 +481,7 @@
'cancel': 0,
'create': 0,
u'doctype': u'DocPerm',
'permlevel': 0,
'permlevel': 1,
'role': u'Sales User',
'submit': 0,
'write': 0
@@ -503,14 +493,40 @@
'cancel': 0,
'create': 0,
u'doctype': u'DocPerm',
'permlevel': 1,
'role': u'All',
'permlevel': 0,
'role': u'Sales User',
'submit': 0,
'write': 0
},
# DocPerm
{
'amend': 0,
'cancel': 1,
'create': 1,
u'doctype': u'DocPerm',
'permlevel': 0,
'role': u'Sales Master Manager',
'submit': 0,
'write': 1
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
u'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Sales Master Manager',
'submit': 0,
'write': 0
},
# DocPerm
{
'cancel': 0,
'create': 0,
u'doctype': u'DocPerm',
'permlevel': 2,
'role': u'Accounts Manager',
@@ -519,6 +535,8 @@
# DocPerm
{
'cancel': 0,
'create': 0,
u'doctype': u'DocPerm',
'permlevel': 2,
'role': u'System Manager',
@@ -527,8 +545,31 @@
# DocPerm
{
'cancel': 0,
'create': 0,
u'doctype': u'DocPerm',
'permlevel': 2,
'role': u'All'
'role': u'All',
'write': 0
},
# DocPerm
{
'cancel': 1,
'create': 1,
u'doctype': u'DocPerm',
'permlevel': 0,
'role': u'Accounts Manager',
'write': 1
},
# DocPerm
{
'cancel': 0,
'create': 0,
u'doctype': u'DocPerm',
'permlevel': 1,
'role': u'All',
'write': 0
}
]

4
selling/doctype/lead/lead.js
View File

@@ -45,7 +45,7 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
cur_frm.cscript.make_communication_body();
}
cur_frm.cscript.refresh_custom_buttons = function() {
cur_frm.cscript.refresh_custom_buttons = function(doc) {
cur_frm.clear_custom_buttons();
if(!doc.__islocal && !in_list(['Converted', 'Lead Lost'], doc.status)) {
if (doc.source != 'Existing Customer') {
@@ -61,7 +61,7 @@ cur_frm.cscript.refresh_custom_buttons = function() {
cur_frm.cscript.refresh = function(doc, cdt, cdn) {
// custom buttons
//---------------
cur_frm.cscript.refresh_custom_buttons();
cur_frm.cscript.refresh_custom_buttons(doc);
erpnext.hide_naming_series();

8
selling/search_criteria/customer_address_contact/customer_address_contact.sql
View File

@@ -1,4 +1,4 @@
select
SELECT
`tabCustomer`.name,
`tabCustomer`.customer_name,
`tabAddress`.address_line1,
@@ -12,7 +12,7 @@ select
`tabContact`.phone,
`tabContact`.mobile_no,
`tabContact`.email_id
from
FROM
`tabCustomer`
left join `tabAddress` on (
`tabAddress`.customer=`tabCustomer`.name and
@@ -22,5 +22,7 @@ from
`tabContact`.customer=`tabCustomer`.name and
ifnull(`tabContact`.is_primary_contact, 0)=1
)
order by
WHERE
`tabCustomer`.docstatus<2
ORDER BY
`tabCustomer`.customer_name asc