Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Nabin Hait 2016-07-28 18:26:23 +05:30
commit 1892520324
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '7.0.9' __version__ = '7.0.10'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@ -267,6 +267,8 @@ class PaymentEntry(AccountsController):
if d.amount: if d.amount:
self.difference_amount -= flt(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): def clear_unallocated_reference_document_rows(self):
self.set("references", self.get("references", {"allocated_amount": ["not in", [0, None, ""]]})) self.set("references", self.get("references", {"allocated_amount": ["not in", [0, None, ""]]}))

2
erpnext/buying/doctype/purchase_common/purchase_common.js
View File

@ -87,7 +87,7 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
refresh: function(doc) { refresh: function(doc) {
this.frm.toggle_display("supplier_name", 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 && if(this.frm.docstatus==0 &&
(this.frm.doctype==="Purchase Order" || this.frm.doctype==="Material Request")) { (this.frm.doctype==="Purchase Order" || this.frm.doctype==="Material Request")) {

1
erpnext/public/js/utils/party.js
View File

@ -45,6 +45,7 @@ erpnext.utils.get_party_details = function(frm, method, args, callback) {
frm.set_value(r.message); frm.set_value(r.message);
frm.updating_party_details = false; frm.updating_party_details = false;
if(callback) callback(); if(callback) callback();
frm.refresh();
} }
} }
}); });