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

fix: Patch typo fix and set label in refresh

Browse Source
This commit is contained in:
deepeshgarg007
2019-04-02 18:22:06 +05:30
parent 1638994436
commit e889a58724
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/patches/v11_1/move_customer_lead_to_dynamic_column.py
View File

@@ -6,5 +6,5 @@ import frappe
def execute(): def execute():
frappe.db.dql(""" UPDATE `tabQuotation` set customer_lead = lead WHERE quotation_to = 'Lead' """) frappe.db.sql(""" UPDATE `tabQuotation` set customer_lead = lead WHERE quotation_to = 'Lead' """)
frappe.db.dql(""" UPDATE `tabQuotation` set customer_lead = customer WHERE quotation_to = 'Customer' """) frappe.db.sql(""" UPDATE `tabQuotation` set customer_lead = customer WHERE quotation_to = 'Customer' """)

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

@@ -22,11 +22,11 @@ frappe.ui.form.on('Quotation', {
refresh: function(frm) { refresh: function(frm) {
frm.trigger("set_label"); frm.trigger("set_label");
frm.trigger("set_dynamic_field_label");
}, },
quotation_to: function(frm) { quotation_to: function(frm) {
frm.trigger("set_label"); frm.trigger("set_label");
frm.trigger("set_dynamic_field_label");
frm.trigger("toggle_reqd_lead_customer"); frm.trigger("toggle_reqd_lead_customer");
}, },

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

@@ -170,7 +170,7 @@
"in_global_search": 1, "in_global_search": 1,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 1, "in_standard_filter": 1,
"label": "", "label": "Customer/Lead",
"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-04-02 10:06:27.850280", "modified": "2019-04-02 10:18:58.506125",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Quotation", "name": "Quotation",

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

@@ -43,7 +43,7 @@ class Quotation(SellingController):
super(Quotation, self).validate_order_type() super(Quotation, self).validate_order_type()
def update_lead(self): def update_lead(self):
if self.quotation_to == "Lead": if self.quotation_to == "Lead" and self.customer_lead:
frappe.get_doc("Lead", self.customer_lead).set_status(update=True) frappe.get_doc("Lead", self.customer_lead).set_status(update=True)
def update_opportunity(self): def update_opportunity(self):