From d05a8737f994add63647466ea27e5a38af2d982c Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 8 Mar 2017 10:30:23 +0530 Subject: [PATCH 1/3] [Fix] Purchase return issue --- erpnext/buying/doctype/purchase_common/purchase_common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js index 5d74760392..47cdefc581 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.js +++ b/erpnext/buying/doctype/purchase_common/purchase_common.js @@ -141,7 +141,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; } From 02198ec8b066d41f39bdbfdbb6aa2f0e651a2884 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Wed, 8 Mar 2017 12:34:07 +0530 Subject: [PATCH 2/3] removed the test_clear_blank_rows test case from JE --- .../doctype/journal_entry/test_journal_entry.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py index b4bb542aa7..bf7261af9e 100644 --- a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py @@ -171,20 +171,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: From 27c4fdc2df9156bf964fa9cdc3e91f413faf1d05 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 8 Mar 2017 15:00:12 +0600 Subject: [PATCH 3/3] bumped to version 7.2.29 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 1ffae7c313..b965a4752f 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'''