From e8f4790d0a0a561db0393148c99683ed0632e0bb Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 16 Nov 2015 18:10:15 +0530 Subject: [PATCH 1/2] [hotfix] --- erpnext/public/js/controllers/taxes_and_totals.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js index 413c7ae5f9d..a8cdf83a299 100644 --- a/erpnext/public/js/controllers/taxes_and_totals.js +++ b/erpnext/public/js/controllers/taxes_and_totals.js @@ -503,7 +503,7 @@ erpnext.taxes_and_totals = erpnext.stock.StockController.extend({ if(this.frm.doc.party_account_currency == this.frm.doc.currency) { var total_amount_to_pay = flt((this.frm.doc.grand_total - this.frm.doc.total_advance - this.frm.doc.write_off_amount), precision("grand_total")); - else { + } else { var total_amount_to_pay = flt((this.frm.doc.base_grand_total - this.frm.doc.total_advance - this.frm.doc.base_write_off_amount), precision("base_grand_total")); } From d9e57978b87a8b15c58d3e535d358bc4cfb547d9 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 16 Nov 2015 18:42:03 +0600 Subject: [PATCH 2/2] bumped to version 6.9.2 --- 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 10b867833a7..7394cf1b385 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '6.9.1' +__version__ = '6.9.2' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 8eb0b25a060..bb117c16132 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -29,7 +29,7 @@ blogs. """ app_icon = "icon-th" app_color = "#e74c3c" -app_version = "6.9.1" +app_version = "6.9.2" 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 290f13fe0d5..41264f8166a 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = "6.9.1" +version = "6.9.2" with open("requirements.txt", "r") as f: install_requires = f.readlines()