nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 13:49:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into subcontracting

Browse Source
This commit is contained in:
s-aga-r
2022-06-03 13:25:49 +05:30
parent 61296a0658 12edddbfd4
commit 992ba974e2
73 changed files with 1847 additions and 2152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/stock/get_item_details.py
View File

@@ -353,6 +353,7 @@ def get_basic_details(args, item, overwrite_warehouse=True):
"has_batch_no": item.has_batch_no,
"batch_no": args.get("batch_no"),
"uom": args.uom,
"stock_uom": item.stock_uom,
"min_order_qty": flt(item.min_order_qty) if args.doctype == "Material Request" else "",
"qty": flt(args.qty) or 1.0,
"stock_qty": flt(args.qty) or 1.0,
@@ -365,7 +366,7 @@ def get_basic_details(args, item, overwrite_warehouse=True):
"net_rate": 0.0,
"net_amount": 0.0,
"discount_percentage": 0.0,
"discount_amount": 0.0,
"discount_amount": flt(args.discount_amount) or 0.0,
"supplier": get_default_supplier(args, item_defaults, item_group_defaults, brand_defaults),
"update_stock": args.get("update_stock")
if args.get("doctype") in ["Sales Invoice", "Purchase Invoice"]
@@ -823,7 +824,9 @@ def insert_item_price(args):
):
if frappe.has_permission("Item Price", "write"):
price_list_rate = (
args.rate / args.get("conversion_factor") if args.get("conversion_factor") else args.rate
(args.rate + args.discount_amount) / args.get("conversion_factor")
if args.get("conversion_factor")
else (args.rate + args.discount_amount)
)
item_price = frappe.db.get_value(
@@ -849,6 +852,7 @@ def insert_item_price(args):
"item_code": args.item_code,
"currency": args.currency,
"price_list_rate": price_list_rate,
"uom": args.stock_uom,
}
)
item_price.insert()