From 0f6eac3b35944fe3874d071d3dcf57fcce35bb07 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 26 Feb 2016 13:01:22 +0530 Subject: [PATCH 1/2] [fix] Show credit note button in sales invoice --- erpnext/accounts/doctype/sales_invoice/sales_invoice.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 200fca6d66..d4d00ffec8 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -57,7 +57,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte return item.is_delivered_by_supplier ? true : false; }) - if(Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) { + if(doc.outstanding_amount >= 0 || Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) { cur_frm.add_custom_button(doc.update_stock ? __('Sales Return') : __('Credit Note'), this.make_sales_return, __("Make")); cur_frm.page.set_inner_btn_group_as_primary(__("Make")); From eb0c08f3280f2bc65a26b0389d627ecde4de1aeb Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 26 Feb 2016 15:51:02 +0600 Subject: [PATCH 2/2] bumped to version 6.23.4 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index d770f49e93..c523351163 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '6.23.3' +__version__ = '6.23.4' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 565f044445..f783fdf7ac 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd." app_description = """ERP made simple""" app_icon = "icon-th" app_color = "#e74c3c" -app_version = "6.23.3" +app_version = "6.23.4" app_email = "info@erpnext.com" app_license = "GNU General Public License (v3)" source_link = "https://github.com/frappe/erpnext" diff --git a/setup.py b/setup.py index 586fc2c195..c0431c2000 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages from pip.req import parse_requirements -version = "6.23.3" +version = "6.23.4" requirements = parse_requirements("requirements.txt", session="") setup(