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

fix: conflicts

Browse Source
This commit is contained in:
pateljannat 2020-12-11 11:46:43 +05:30
parent fa72671929
commit 06961a261e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/selling/doctype/sales_order/sales_order.py
View File

@ -840,7 +840,8 @@ def make_purchase_order_for_default_supplier(source_name, selected_items=[], tar
"contact_email",
"contact_person",
"taxes_and_charges",
"shipping_address"
"shipping_address",
"terms"
],
"validation": {
"docstatus": ["=", 1]
@ -859,7 +860,10 @@ def make_purchase_order_for_default_supplier(source_name, selected_items=[], tar
"field_no_map": [
"rate",
"price_list_rate",
"item_tax_template"
"item_tax_template",
"discount_percentage",
"discount_amount",
"pricing_rules"
],
"postprocess": update_item,
"condition": lambda doc: doc.ordered_qty < doc.stock_qty and doc.supplier == supplier and doc.item_code in items_to_map