schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Rate for internal PI have non stock UOM items

Browse Source 
(cherry picked from commit 0f655e4430)

# Conflicts:
#	erpnext/controllers/buying_controller.py
This commit is contained in:
Deepesh Garg
2022-09-09 12:40:57 +05:30
committed by Mergify
parent a9e9dad66a
commit c06e241fbc
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/controllers/buying_controller.py
View File

@@ -308,7 +308,16 @@ class BuyingController(SubcontractingController):
rate = flt(outgoing_rate * (d.conversion_factor or 1), d.precision("rate")) rate = flt(outgoing_rate * (d.conversion_factor or 1), d.precision("rate"))
else: else:
<<<<<<< HEAD
rate = frappe.db.get_value(ref_doctype, d.get(frappe.scrub(ref_doctype)), "rate") rate = frappe.db.get_value(ref_doctype, d.get(frappe.scrub(ref_doctype)), "rate")
=======
field = "incoming_rate" if self.get("is_internal_supplier") else "rate"
rate = flt(
frappe.db.get_value(ref_doctype, d.get(frappe.scrub(ref_doctype)), field)
* (d.conversion_factor or 1),
d.precision("rate"),
)
>>>>>>> 0f655e4430 (fix: Rate for internal PI have non stock UOM items)
if self.is_internal_transfer(): if self.is_internal_transfer():
if rate != d.rate: if rate != d.rate: