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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Nabin Hait 2012-12-12 16:35:50 +05:30
commit 48b7fc8972
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup/page/permission_engine/permission_engine.html
View File

@ -5,4 +5,6 @@
One of the Roles has <b>Submit</b> permission. 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. You will have to <b>Cancel</b> and then <b>Amend</b> a submitted Document for making changes.
</div> </div>
<hr>
<div class="well">Note: A document is not accessible to a user if Permission at level 0 is not given.</div>
</div> </div>

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

@ -150,7 +150,7 @@ cur_frm.fields_dict['select_print_heading'].get_query = function(doc, cdt, cdn)
cur_frm.cscript.received_qty = function(doc, cdt, cdn) { cur_frm.cscript.received_qty = function(doc, cdt, cdn) {
var d = locals[cdt][cdn]; var d = locals[cdt][cdn];
ret = { ret = {
'qty' : 0, 'qty' : d.qty ? d.qty : d.received_qty,
'stock_qty': 0, 'stock_qty': 0,
'rejected_qty' : 0 'rejected_qty' : 0
} }