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

[fix] [minor] pull only undelivered items in Dn from SO

Browse Source
This commit is contained in:
Nabin Hait 2013-07-30 12:54:22 +05:30
parent 9764e32d0a
commit de72b44d28
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buying/doctype/purchase_common/purchase_common.py
View File

@ -76,7 +76,11 @@ class DocType(BuyingController):
elif is_submit == 1: elif is_submit == 1:
# even if this transaction is the latest one, it should be submitted # even if this transaction is the latest one, it should be submitted
# for it to be considered for latest purchase rate # for it to be considered for latest purchase rate
last_purchase_rate = flt(d.purchase_rate) / flt(d.conversion_factor) if flt(d.conversion_factor):
last_purchase_rate = flt(d.purchase_rate) / flt(d.conversion_factor)
else:
msgprint(_("Row ") + cstr(d.idx) + ": " +
_("UOM Conversion Factor is mandatory"), raise_exception=1)
# update last purchsae rate # update last purchsae rate
if last_purchase_rate: if last_purchase_rate:

3
selling/doctype/sales_order/sales_order.py
View File

@ -396,7 +396,8 @@ def make_delivery_note(source_name, target_doclist=None):
"parenttype": "prevdoc_doctype", "parenttype": "prevdoc_doctype",
"reserved_warehouse": "warehouse" "reserved_warehouse": "warehouse"
}, },
"postprocess": update_item "postprocess": update_item,
"condition": lambda doc: doc.delivered_qty < doc.qty
}, },
"Sales Taxes and Charges": { "Sales Taxes and Charges": {
"doctype": "Sales Taxes and Charges", "doctype": "Sales Taxes and Charges",