Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/setup/page/permission_engine/permission_engine.html b/setup/page/permission_engine/permission_engine.html
index 7831447..8d98958 100644
--- a/setup/page/permission_engine/permission_engine.html
+++ b/setup/page/permission_engine/permission_engine.html
@@ -5,4 +5,6 @@
One of the Roles has <b>Submit</b> permission.
You will have to <b>Cancel</b> and then <b>Amend</b> a submitted Document for making changes.
</div>
+<hr>
+<div class="well">Note: A document is not accessible to a user if Permission at level 0 is not given.</div>
</div>
diff --git a/stock/doctype/purchase_receipt/purchase_receipt.js b/stock/doctype/purchase_receipt/purchase_receipt.js
index d26636e..9ed587b 100644
--- a/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -150,7 +150,7 @@
cur_frm.cscript.received_qty = function(doc, cdt, cdn) {
var d = locals[cdt][cdn];
ret = {
- 'qty' : 0,
+ 'qty' : d.qty ? d.qty : d.received_qty,
'stock_qty': 0,
'rejected_qty' : 0
}