diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 2985dac0c2a..c4c319fa638 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = '7.2.28' +__version__ = '7.2.29' def get_default_company(user=None): '''Get default company for user''' diff --git a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py index 8756ca44136..bf7261af9e3 100644 --- a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py @@ -172,20 +172,6 @@ class TestJournalEntry(unittest.TestCase): jv.submit() - def test_clear_blank_rows(self): - je = make_journal_entry("_Test Bank - _TC", "_Test Account Stock Expenses - _TC", 100, save=False) - je.append("accounts", { - "account": "_Test Cash - _TC", - "debit_in_account_currency": 0, - "credit_in_account_currency": 0, - "exchange_rate": 1 - }) - - self.assertEqual(len(je.get("accounts")), 3) - je.save() - self.assertEqual(len(je.get("accounts")), 2) - - def make_journal_entry(account1, account2, amount, cost_center=None, posting_date=None, exchange_rate=1, save=True, submit=False, project=None): if not cost_center: cost_center = "_Test Cost Center - _TC" diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js index b6b147cfd26..9e40156dbcc 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.js +++ b/erpnext/buying/doctype/purchase_common/purchase_common.js @@ -111,7 +111,7 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({ var item = frappe.get_doc(cdt, cdn); if ((doc.doctype == "Purchase Receipt") || (doc.doctype == "Purchase Invoice" && doc.update_stock)) { frappe.model.round_floats_in(item, ["qty", "received_qty"]); - if(!(item.received_qty || item.rejected_qty) && item.qty) { + if(!item.rejected_qty && item.qty) { item.received_qty = item.qty; }