From 9c6e2c3637d2b9dfb7cb785c9ccab5e06f91cb16 Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Thu, 27 Jul 2017 16:23:57 +0530 Subject: [PATCH 1/3] [hotfix] included the get_purchase_trends_filters instead of get_sales_trends_filters in Purchase Receipts trends (#10127) --- .../report/purchase_receipt_trends/purchase_receipt_trends.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js b/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js index 63d53fbfb0..d16485e8cc 100644 --- a/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js +++ b/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js @@ -3,7 +3,7 @@ frappe.require("assets/erpnext/js/purchase_trends_filters.js", function() { frappe.query_reports["Purchase Receipt Trends"] = { - filters: erpnext.get_sales_trends_filters() + filters: erpnext.get_purchase_trends_filters() } }); From 145393b12f55832ff5d599c6b2dbbbdb93e961d0 Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Thu, 27 Jul 2017 16:46:40 +0530 Subject: [PATCH 2/3] [hotfix] set the account name in GL entry instead of warehouse (#10134) --- erpnext/stock/doctype/purchase_receipt/purchase_receipt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py index f60eb6aa7c..0444369ff3 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py @@ -225,7 +225,7 @@ class PurchaseReceipt(BuyingController): # sub-contracting warehouse if flt(d.rm_supp_cost) and warehouse_account.get(self.supplier_warehouse): gl_entries.append(self.get_gl_dict({ - "account": warehouse_account[self.supplier_warehouse]["name"], + "account": warehouse_account[self.supplier_warehouse]["account"], "against": warehouse_account[d.warehouse]["account"], "cost_center": d.cost_center, "remarks": self.get("remarks") or _("Accounting Entry for Stock"), From 6f9ef5b89018e55335370d813d78330c4bc0456e Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 27 Jul 2017 18:20:27 +0600 Subject: [PATCH 3/3] bumped to version 8.6.3 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index f5c1fbec4c..b0692038f8 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -4,7 +4,7 @@ import inspect import frappe from erpnext.hooks import regional_overrides -__version__ = '8.6.2' +__version__ = '8.6.3' def get_default_company(user=None): '''Get default company for user'''