From 881a47f5c715f6c321f138c8648ba460a3404574 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 6 Sep 2013 12:42:54 +0530 Subject: [PATCH 1/2] [minor] moved developer mode to wn --- CONTRIBUTING.md | 2 +- startup/boot.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4164b2b6bb2..57fca34c40c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,7 +20,7 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso 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/startup/boot.py b/startup/boot.py index 48bdeec09cf..886b805db43 100644 --- a/startup/boot.py +++ b/startup/boot.py @@ -33,9 +33,8 @@ def boot_session(bootinfo): # 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"}) From a3f6fda0df482b5ce8bf39eefb2d25d261e8d1e6 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 6 Sep 2013 13:37:52 +0530 Subject: [PATCH 2/2] [fix] Hide Make Delivery Note button, if Sales Invoice is made from Delivery Note. Hide Make Invoice Button, if Delivery Note is made from Sales Invoice --- accounts/doctype/sales_invoice/sales_invoice.js | 14 ++++++++++++-- stock/doctype/delivery_note/delivery_note.js | 12 +++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js index 1378fab51a6..f224c352dea 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.js +++ b/accounts/doctype/sales_invoice/sales_invoice.js @@ -62,8 +62,18 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte 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/stock/doctype/delivery_note/delivery_note.js b/stock/doctype/delivery_note/delivery_note.js index 063b25899df..80c26463ff8 100644 --- a/stock/doctype/delivery_note/delivery_note.js +++ b/stock/doctype/delivery_note/delivery_note.js @@ -16,7 +16,17 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend( 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);