Merge branch 'develop' into subcontracting

2022-07-07 09:56:23 +05:30
parent f75d35ed60 891fd70882
commit f9885746a8
183 changed files with 619 additions and 73660 deletions
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -305,7 +305,7 @@ class BuyingController(SubcontractingController):
 						raise_error_if_no_rate=False,
 					)

-					rate = flt(outgoing_rate * d.conversion_factor, d.precision("rate"))
+					rate = flt(outgoing_rate * (d.conversion_factor or 1), d.precision("rate"))
 				else:
 					rate = frappe.db.get_value(ref_doctype, d.get(frappe.scrub(ref_doctype)), "rate")