Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.23.3'
+__version__ = '6.23.4'

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"));

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"

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(