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

Merge pull request #1765 from anandpdoshi/hotfix

Browse Source 
Fixed Purchase Receipt qty trigger
This commit is contained in:
Anand Doshi 2014-06-06 20:39:52 +05:30
commit 276386c94a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/patches/v4_0/reset_permissions_for_masters.py
View File

@ -12,8 +12,7 @@ def execute():
"Designation", "Earning Type", "Event", "Feed", "File Data", "Fiscal Year", "Designation", "Earning Type", "Event", "Feed", "File Data", "Fiscal Year",
"HR Settings", "Industry Type", "Jobs Email Settings", "Leave Type", "Letter Head", "HR Settings", "Industry Type", "Jobs Email Settings", "Leave Type", "Letter Head",
"Mode of Payment", "Module Def", "Naming Series", "POS Setting", "Print Heading", "Mode of Payment", "Module Def", "Naming Series", "POS Setting", "Print Heading",
"Report", "Role", "Sales Email Settings", "Selling Settings", "Shopping Cart Settings", "Report", "Role", "Sales Email Settings", "Selling Settings", "Stock Settings", "Supplier Type", "UOM"):
"Stock Settings", "Supplier Type", "UOM"):
try: try:
frappe.reset_perms(doctype) frappe.reset_perms(doctype)
except: except:

2
erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
View File

@ -64,7 +64,7 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
item.rejected_qty = flt(item.received_qty - item.qty, precision("rejected_qty", item)); 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) { rejected_qty: function(doc, cdt, cdn) {