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

[minor] add close button in opportunity and project links in customer

Browse Source
This commit is contained in:
Rushabh Mehta 2015-08-06 15:37:01 +05:30
parent 147acfd502
commit 48cccca9af
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,9 +80,23 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) {
if(doc.status!=="Quotation") if(doc.status!=="Quotation")
cur_frm.add_custom_button(__('Opportunity Lost'), cur_frm.add_custom_button(__('Opportunity Lost'),
cur_frm.cscript['Declare Opportunity Lost'], "icon-remove", "btn-default"); cur_frm.cscript['Declare Opportunity Lost'], "icon-remove", "btn-default");
} }
var frm = cur_frm;
if(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) {

3
erpnext/selling/doctype/customer/customer.js
View File

@ -46,6 +46,7 @@ cur_frm.cscript.setup_dashboard = function(doc) {
cur_frm.dashboard.add_doctype_badge("Sales Order", "customer"); cur_frm.dashboard.add_doctype_badge("Sales Order", "customer");
cur_frm.dashboard.add_doctype_badge("Delivery Note", "customer"); cur_frm.dashboard.add_doctype_badge("Delivery Note", "customer");
cur_frm.dashboard.add_doctype_badge("Sales Invoice", "customer"); cur_frm.dashboard.add_doctype_badge("Sales Invoice", "customer");
cur_frm.dashboard.add_doctype_badge("Project", "customer");
return frappe.call({ return frappe.call({
type: "GET", type: "GET",
@ -62,6 +63,8 @@ cur_frm.cscript.setup_dashboard = function(doc) {
+ '</b> / <span class="text-muted">' + __("Unpaid") + ": <b>" + '</b> / <span class="text-muted">' + __("Unpaid") + ": <b>"
+ format_currency(r.message.total_unpaid, r.message["company_currency"][0]) + format_currency(r.message.total_unpaid, r.message["company_currency"][0])
+ '</b></span>'); + '</b></span>');
} else {
cur_frm.dashboard.set_headline("");
} }
} }
cur_frm.dashboard.set_badge_count(r.message); cur_frm.dashboard.set_badge_count(r.message);

3
erpnext/selling/doctype/customer/customer.py
View File

@ -119,7 +119,8 @@ def get_dashboard_info(customer):
frappe.msgprint(_("Not permitted"), raise_exception=True) frappe.msgprint(_("Not permitted"), raise_exception=True)
out = {} out = {}
for doctype in ["Opportunity", "Quotation", "Sales Order", "Delivery Note", "Sales Invoice"]: for doctype in ["Opportunity", "Quotation", "Sales Order", "Delivery Note",
"Sales Invoice", "Project"]:
out[doctype] = frappe.db.get_value(doctype, out[doctype] = frappe.db.get_value(doctype,
{"customer": customer, "docstatus": ["!=", 2] }, "count(*)") {"customer": customer, "docstatus": ["!=", 2] }, "count(*)")