schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: quotation link in the lead dashboard not working and filter from the dashboard was not applying

Browse Source
This commit is contained in:
Rohit Waghchaure
2019-05-07 09:39:30 +05:30
parent 552615525c
commit 4a73059ed3
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/crm/doctype/lead/lead_dashboard.py
View File

@@ -4,6 +4,10 @@ from frappe import _
def get_data(): def get_data():
return { return {
'fieldname': 'lead', 'fieldname': 'lead',
'non_standard_fieldnames': {
'Quotation': 'party_name',
'Opportunity': 'party_name'
},
'transactions': [ 'transactions': [
{ {
'items': ['Opportunity', 'Quotation'] 'items': ['Opportunity', 'Quotation']

5
erpnext/public/js/utils/party.js
View File

@@ -8,9 +8,10 @@ erpnext.utils.get_party_details = function(frm, method, args, callback) {
method = "erpnext.accounts.party.get_party_details"; method = "erpnext.accounts.party.get_party_details";
} }
if(!args) { if(!args) {
if(frm.doctype != "Purchase Order" && frm.doc.customer) { if((frm.doctype != "Purchase Order" && frm.doc.customer)
|| (frm.doc.party_name && in_list(['Quotation', 'Opportunity'], frm.doc.doctype))) {
args = { args = {
party: frm.doc.customer, party: frm.doc.customer || frm.doc.party_name,
party_type: "Customer", party_type: "Customer",
price_list: frm.doc.selling_price_list price_list: frm.doc.selling_price_list
}; };

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

@@ -42,6 +42,12 @@ erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({
this._super(doc, dt, dn); this._super(doc, dt, dn);
}, },
party_name: function() {
var me = this;
erpnext.utils.get_party_details(this.frm, null, null, function() {
me.apply_price_list();
});
},
refresh: function(doc, dt, dn) { refresh: function(doc, dt, dn) {
this._super(doc, dt, dn); this._super(doc, dt, dn);
doctype = doc.quotation_to == 'Customer' ? 'Customer':'Lead'; doctype = doc.quotation_to == 'Customer' ? 'Customer':'Lead';

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

@@ -169,8 +169,8 @@
"in_filter": 0, "in_filter": 0,
"in_global_search": 1, "in_global_search": 1,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 1, "in_standard_filter": 0,
"label": "Customer/Lead", "label": "Party",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "customer", "oldfieldname": "customer",
@@ -3224,7 +3224,7 @@
"istable": 0, "istable": 0,
"max_attachments": 1, "max_attachments": 1,
"menu_index": 0, "menu_index": 0,
"modified": "2019-05-07 12:42:51.125194", "modified": "2019-05-07 14:29:22.565474",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Quotation", "name": "Quotation",