From 482d29dc53d8fa4e2c54ce45ae73cd1bd025ee55 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 6 Jun 2014 20:34:08 +0530 Subject: [PATCH 1/2] Fixed Purchase Receipt qty trigger --- erpnext/stock/doctype/purchase_receipt/purchase_receipt.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js index 5851709d66..f80b4f8f4c 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js @@ -64,7 +64,7 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend item.rejected_qty = flt(item.received_qty - item.qty, precision("rejected_qty", item)); } - this._super(); + this._super(doc, cdt, cdn); }, rejected_qty: function(doc, cdt, cdn) { From 0aa125304d3eed4d848873dbbaa866635b2ef20d Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 6 Jun 2014 20:39:21 +0530 Subject: [PATCH 2/2] Fixed Reset Permissions patch --- erpnext/patches/v4_0/reset_permissions_for_masters.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/patches/v4_0/reset_permissions_for_masters.py b/erpnext/patches/v4_0/reset_permissions_for_masters.py index fdafb87011..d031bd0ebd 100644 --- a/erpnext/patches/v4_0/reset_permissions_for_masters.py +++ b/erpnext/patches/v4_0/reset_permissions_for_masters.py @@ -12,8 +12,7 @@ def execute(): "Designation", "Earning Type", "Event", "Feed", "File Data", "Fiscal Year", "HR Settings", "Industry Type", "Jobs Email Settings", "Leave Type", "Letter Head", "Mode of Payment", "Module Def", "Naming Series", "POS Setting", "Print Heading", - "Report", "Role", "Sales Email Settings", "Selling Settings", "Shopping Cart Settings", - "Stock Settings", "Supplier Type", "UOM"): + "Report", "Role", "Sales Email Settings", "Selling Settings", "Stock Settings", "Supplier Type", "UOM"): try: frappe.reset_perms(doctype) except: