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

chore: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-09-13 13:40:36 +05:30
parent c06e241fbc
commit dda057d257
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/buying_controller.py
View File

@@ -308,16 +308,12 @@ 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")
=======
field = "incoming_rate" if self.get("is_internal_supplier") else "rate" field = "incoming_rate" if self.get("is_internal_supplier") else "rate"
rate = flt( rate = flt(
frappe.db.get_value(ref_doctype, d.get(frappe.scrub(ref_doctype)), field) frappe.db.get_value(ref_doctype, d.get(frappe.scrub(ref_doctype)), field)
* (d.conversion_factor or 1), * (d.conversion_factor or 1),
d.precision("rate"), 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: