From b5c56f6cea6441ce0b88a5e01cb3ec6107ade15c Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Mon, 27 Oct 2014 09:41:25 +0530 Subject: [PATCH 1/4] [minor] add port to test site --- test_sites/test_site/site_config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/test_sites/test_site/site_config.json b/test_sites/test_site/site_config.json index 12007b87ec..1b388a0856 100644 --- a/test_sites/test_site/site_config.json +++ b/test_sites/test_site/site_config.json @@ -2,5 +2,6 @@ "db_name": "test_frappe", "db_password": "test_frappe", "admin_password": "admin", + "host_name": "http://localhost:8888", "mute_emails": 1 } From 4e61536f50725a674e8d56826779b079ea94d59c Mon Sep 17 00:00:00 2001 From: ankitjavalkarwork Date: Wed, 22 Oct 2014 17:43:07 +0530 Subject: [PATCH 2/4] Fix Customer Issue error on click event of Serial No. field --- .../support/doctype/customer_issue/customer_issue.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/erpnext/support/doctype/customer_issue/customer_issue.js b/erpnext/support/doctype/customer_issue/customer_issue.js index 67a265dd02..b12003a583 100644 --- a/erpnext/support/doctype/customer_issue/customer_issue.js +++ b/erpnext/support/doctype/customer_issue/customer_issue.js @@ -51,9 +51,14 @@ cur_frm.fields_dict['serial_no'].get_query = function(doc, cdt, cdn) { ['Serial No', 'docstatus', '!=', 2], ['Serial No', 'status', '=', "Delivered"] ]; - if(doc.item_code) cond = ['Serial No', 'item_code', '=', doc.item_code]; - if(doc.customer) cond = ['Serial No', 'customer', '=', doc.customer]; - filter.push(cond); + if(doc.item_code) { + cond = ['Serial No', 'item_code', '=', doc.item_code]; + filter.push(cond); + } + if(doc.customer) { + cond = ['Serial No', 'customer', '=', doc.customer]; + filter.push(cond); + } return{ filters:filter } From ee212e7bb560eff127917e63bc1fb6a98bfb2f3c Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 29 Oct 2014 14:25:49 +0530 Subject: [PATCH 3/4] [fix] Floating point issue fixed in payment reconciliation --- .../doctype/payment_reconciliation/payment_reconciliation.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py index c6a2b056da..a18ee435e1 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py @@ -96,13 +96,14 @@ class PaymentReconciliation(Document): payment_amount = payment_amount[0][0] if payment_amount else 0 - if d.invoice_amount > payment_amount: + if d.invoice_amount - payment_amount > 0.005: non_reconciled_invoices.append({ 'voucher_no': d.voucher_no, 'voucher_type': d.voucher_type, 'posting_date': d.posting_date, 'invoice_amount': flt(d.invoice_amount), - 'outstanding_amount': d.invoice_amount - payment_amount}) + 'outstanding_amount': flt(d.invoice_amount - payment_amount, 2) + }) self.add_invoice_entries(non_reconciled_invoices) From dda239fd49c716f2f4c1b380724c871ceec6b58a Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Thu, 30 Oct 2014 14:52:17 +0600 Subject: [PATCH 4/4] bumped to version 4.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 84fddef10e..be4c11176d 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1 +1 @@ -__version__ = '4.9.1' +__version__ = '4.9.2' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 6f4a41ed6e..9a701100f4 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -4,7 +4,7 @@ app_publisher = "Web Notes Technologies Pvt. Ltd. and Contributors" app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations" app_icon = "icon-th" app_color = "#e74c3c" -app_version = "4.9.1" +app_version = "4.9.2" error_report_email = "support@erpnext.com" diff --git a/setup.py b/setup.py index 5bdcc94cf0..4abed79d16 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import os -version = "4.9.1" +version = "4.9.2" with open("requirements.txt", "r") as f: install_requires = f.readlines()