From c2bf50042f23afc1317c372940c490762bceb1d5 Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Thu, 25 May 2017 14:14:42 +0530 Subject: [PATCH 1/4] validate email id only if provided (#9020) --- erpnext/hr/doctype/job_applicant/job_applicant.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.py b/erpnext/hr/doctype/job_applicant/job_applicant.py index acc1c64d43..2de20dd3c0 100644 --- a/erpnext/hr/doctype/job_applicant/job_applicant.py +++ b/erpnext/hr/doctype/job_applicant/job_applicant.py @@ -27,7 +27,8 @@ class JobApplicant(Document): def validate(self): self.check_email_id_is_unique() - validate_email_add(self.email_id, True) + if self.email_id: + validate_email_add(self.email_id, True) if not self.applicant_name and self.email_id: guess = self.email_id.split('@')[0] From e9cf1aba77a5a73237fa9d0bd687d83a0ef3cc36 Mon Sep 17 00:00:00 2001 From: Ayush Shukla Date: Thu, 25 May 2017 14:14:55 +0530 Subject: [PATCH 2/4] added float and rebase with hotfix (#9019) --- erpnext/controllers/taxes_and_totals.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py index c1c1fd7cda..822d50bfdf 100644 --- a/erpnext/controllers/taxes_and_totals.py +++ b/erpnext/controllers/taxes_and_totals.py @@ -462,7 +462,8 @@ class calculate_taxes_and_totals(object): if self.doc.is_pos: for payment in self.doc.get('payments'): - payment.base_amount = flt(payment.amount * self.doc.conversion_rate) + payment.amount = flt(payment.amount) + payment.base_amount = payment.amount * flt(self.doc.conversion_rate) paid_amount += payment.amount base_paid_amount += payment.base_amount elif not self.doc.is_return: From 7e7dc0f25467fe732e9a0d1694bad96700197faa Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 25 May 2017 14:18:20 +0530 Subject: [PATCH 3/4] Update party.py --- erpnext/accounts/party.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py index 0501d3870b..a1c76974cd 100644 --- a/erpnext/accounts/party.py +++ b/erpnext/accounts/party.py @@ -8,7 +8,7 @@ import datetime from frappe import _, msgprint, scrub from frappe.defaults import get_user_permissions from frappe.utils import add_days, getdate, formatdate, get_first_day, date_diff, \ - add_years, get_timestamp, nowdate + add_years, get_timestamp, nowdate, flt from frappe.geo.doctype.address.address import get_address_display, get_default_address from frappe.email.doctype.contact.contact import get_contact_details, get_default_contact from erpnext.exceptions import PartyFrozen, InvalidCurrency, PartyDisabled, InvalidAccountCurrency @@ -389,10 +389,10 @@ def get_dashboard_info(party_type, party): where party_type = %s and party=%s""", (party_type, party)) info = {} - info["billing_this_year"] = billing_this_year[0][0] if billing_this_year else 0 + info["billing_this_year"] = flt(billing_this_year[0][0]) if billing_this_year else 0 info["currency"] = party_account_currency - info["total_unpaid"] = total_unpaid[0][0] if total_unpaid else 0 + info["total_unpaid"] = flt(total_unpaid[0][0]) if total_unpaid else 0 if party_type == "Supplier": info["total_unpaid"] = -1 * info["total_unpaid"] - return info \ No newline at end of file + return info From d7d9cd293860706949283c50935bf156b246ed12 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 25 May 2017 14:49:50 +0600 Subject: [PATCH 4/4] bumped to version 8.0.39 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 235b1b0a01..f11555fc26 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = '8.0.38' +__version__ = '8.0.39' def get_default_company(user=None):