Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4164b2b..57fca34 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,7 +20,7 @@
1. Screenshots (annotated with what should change)
1. Screenshots from other products if you want us to implement features present in other products.
1. Basically, the more you help us, the faster your request is likely to be completed.
-1. A one line future request like **Implement Capacity Planning** will be closed.
+1. A one line feature request like **Implement Capacity Planning** will be closed.
## Pull Requests
diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js
index 1378fab..f224c35 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/accounts/doctype/sales_invoice/sales_invoice.js
@@ -62,8 +62,18 @@
cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms);
- if(cint(doc.update_stock)!=1)
- cur_frm.add_custom_button('Make Delivery', cur_frm.cscript['Make Delivery Note']);
+ if(cint(doc.update_stock)!=1) {
+ // show Make Delivery Note button only if Sales Invoice is not created from Delivery Note
+ var from_delivery_note = false;
+ from_delivery_note = cur_frm.get_doclist({parentfield: "entries"})
+ .some(function(item) {
+ return item.delivery_note ? true : false;
+ });
+
+ if(!from_delivery_note)
+ cur_frm.add_custom_button('Make Delivery', cur_frm.cscript['Make Delivery Note']);
+ }
+
if(doc.outstanding_amount!=0)
cur_frm.add_custom_button('Make Payment Entry', cur_frm.cscript.make_bank_voucher);
diff --git a/startup/boot.py b/startup/boot.py
index 48bdeec..886b805 100644
--- a/startup/boot.py
+++ b/startup/boot.py
@@ -33,9 +33,8 @@
# load subscription info
import conf
- for key in ['max_users', 'expires_on', 'max_space', 'status', 'developer_mode',
- 'commercial_support']:
- if hasattr(conf, key): bootinfo[key] = getattr(conf, key)
+ for key in ['max_users', 'expires_on', 'max_space', 'status', 'commercial_support']:
+ if hasattr(conf, key): bootinfo[key] = getattr(conf, key)
bootinfo['docs'] += webnotes.conn.sql("""select name, default_currency, cost_center
from `tabCompany`""", as_dict=1, update={"doctype":":Company"})
diff --git a/stock/doctype/delivery_note/delivery_note.js b/stock/doctype/delivery_note/delivery_note.js
index 063b258..80c2646 100644
--- a/stock/doctype/delivery_note/delivery_note.js
+++ b/stock/doctype/delivery_note/delivery_note.js
@@ -16,7 +16,17 @@
refresh: function(doc, dt, dn) {
this._super();
- if(!doc.__billing_complete && doc.docstatus==1) cur_frm.add_custom_button('Make Invoice', this.make_sales_invoice);
+ if(!doc.__billing_complete && doc.docstatus==1) {
+ // show Make Invoice button only if Delivery Note is not created from Sales Invoice
+ var from_sales_invoice = false;
+ from_sales_invoice = cur_frm.get_doclist({parentfield: "delivery_note_details"})
+ .some(function(item) {
+ return item.prevdoc_doctype==="Sales Invoice" ? true : false;
+ });
+
+ if(!from_sales_invoice)
+ cur_frm.add_custom_button('Make Invoice', this.make_sales_invoice);
+ }
if(flt(doc.per_installed, 2) < 100 && doc.docstatus==1)
cur_frm.add_custom_button('Make Installation Note', this.make_installation_note);