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

Fixed opportunity status (#9062)

Browse Source
This commit is contained in:
Nabin Hait
2017-05-30 15:34:20 +05:30
committed by GitHub
parent 5f7b88d9c3
commit 6a5cf672c1
3 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/status_updater.py
View File

@@ -19,10 +19,10 @@ status_map = {
["Converted", "has_customer"], ["Converted", "has_customer"],
], ],
"Opportunity": [ "Opportunity": [
["Quotation", "has_active_quotation"],
["Converted", "has_ordered_quotation"],
["Lost", "eval:self.status=='Lost'"], ["Lost", "eval:self.status=='Lost'"],
["Lost", "has_lost_quotation"], ["Lost", "has_lost_quotation"],
["Quotation", "has_active_quotation"],
["Converted", "has_ordered_quotation"],
["Closed", "eval:self.status=='Closed'"] ["Closed", "eval:self.status=='Closed'"]
], ],
"Quotation": [ "Quotation": [

34
erpnext/crm/doctype/opportunity/opportunity.js
View File

@@ -35,6 +35,7 @@ frappe.ui.form.on("Opportunity", {
var doc = frm.doc; var doc = frm.doc;
frm.events.enquiry_from(frm); frm.events.enquiry_from(frm);
frm.trigger('set_contact_link'); frm.trigger('set_contact_link');
erpnext.toggle_naming_series();
if(!doc.__islocal && doc.status!=="Lost") { if(!doc.__islocal && doc.status!=="Lost") {
if(doc.with_items){ if(doc.with_items){
@@ -53,6 +54,20 @@ frappe.ui.form.on("Opportunity", {
frm.add_custom_button(__('Lost'), frm.add_custom_button(__('Lost'),
cur_frm.cscript['Declare Opportunity Lost']); cur_frm.cscript['Declare Opportunity Lost']);
} }
},
if(!frm.doc.__islocal && frm.perm[0].write && frm.doc.docstatus==0) {
if(frm.doc.status==="Open") {
frm.add_custom_button(__("Close"), function() {
frm.set_value("status", "Closed");
frm.save();
});
} else {
frm.add_custom_button(__("Reopen"), function() {
frm.set_value("status", "Open");
frm.save();
});
}
} }
}, },
@@ -122,25 +137,6 @@ erpnext.crm.Opportunity = frappe.ui.form.Controller.extend({
$.extend(cur_frm.cscript, new erpnext.crm.Opportunity({frm: cur_frm})); $.extend(cur_frm.cscript, new erpnext.crm.Opportunity({frm: cur_frm}));
cur_frm.cscript.refresh = function(doc, cdt, cdn) {
erpnext.toggle_naming_series();
var frm = cur_frm;
if(!doc.__islocal && frm.perm[0].write && doc.docstatus==0) {
if(frm.doc.status==="Open") {
frm.add_custom_button(__("Close"), function() {
frm.set_value("status", "Closed");
frm.save();
});
} else {
frm.add_custom_button(__("Reopen"), function() {
frm.set_value("status", "Open");
frm.save();
});
}
}
}
cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) { cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) {
if(doc.enquiry_from == 'Lead' && doc.lead) if(doc.enquiry_from == 'Lead' && doc.lead)
cur_frm.cscript.lead(doc, cdt, cdn); cur_frm.cscript.lead(doc, cdt, cdn);

1
erpnext/crm/doctype/opportunity/opportunity.py
View File

@@ -31,7 +31,6 @@ class Opportunity(TransactionBase):
if not self.enquiry_from: if not self.enquiry_from:
frappe.throw(_("Opportunity From field is mandatory")) frappe.throw(_("Opportunity From field is mandatory"))
self.set_status()
self.validate_item_details() self.validate_item_details()
self.validate_uom_is_integer("uom", "qty") self.validate_uom_is_integer("uom", "qty")
self.validate_lead_cust() self.validate_lead_cust()