diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 8c389f91b34..b5927399d61 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = '7.0.9' +__version__ = '7.0.10' def get_default_company(user=None): '''Get default company for user''' diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index 3eed70cbccf..6c04cf53ccb 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -267,6 +267,8 @@ class PaymentEntry(AccountsController): if d.amount: self.difference_amount -= flt(d.amount) + self.difference_amount = flt(self.difference_amount, self.precision("difference_amount")) + def clear_unallocated_reference_document_rows(self): self.set("references", self.get("references", {"allocated_amount": ["not in", [0, None, ""]]})) diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js index 1806d93d4bf..2e7651699b0 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.js +++ b/erpnext/buying/doctype/purchase_common/purchase_common.js @@ -87,7 +87,7 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({ refresh: function(doc) { this.frm.toggle_display("supplier_name", - (this.supplier_name && this.frm.doc.supplier_name!==this.frm.doc.supplier)); + (this.frm.doc.supplier_name && this.frm.doc.supplier_name!==this.frm.doc.supplier)); if(this.frm.docstatus==0 && (this.frm.doctype==="Purchase Order" || this.frm.doctype==="Material Request")) { diff --git a/erpnext/public/js/utils/party.js b/erpnext/public/js/utils/party.js index f5496ed1d11..a3f3550714c 100644 --- a/erpnext/public/js/utils/party.js +++ b/erpnext/public/js/utils/party.js @@ -45,6 +45,7 @@ erpnext.utils.get_party_details = function(frm, method, args, callback) { frm.set_value(r.message); frm.updating_party_details = false; if(callback) callback(); + frm.refresh(); } } });