fix: not able to make inter-company po from so (#38826) (cherry picked from commit 23042dfc3c0d02374c5710ed679731b1910f9b9a) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
parent
8d79365e0d
commit
32a608f948
@ -2382,9 +2382,18 @@ def make_inter_company_transaction(doctype, source_name, target_doc=None):
|
|||||||
|
|
||||||
|
|
||||||
def get_received_items(reference_name, doctype, reference_fieldname):
|
def get_received_items(reference_name, doctype, reference_fieldname):
|
||||||
|
reference_field = "inter_company_invoice_reference"
|
||||||
|
if doctype == "Purchase Order":
|
||||||
|
reference_field = "inter_company_order_reference"
|
||||||
|
|
||||||
|
filters = {
|
||||||
|
reference_field: reference_name,
|
||||||
|
"docstatus": 1,
|
||||||
|
}
|
||||||
|
|
||||||
target_doctypes = frappe.get_all(
|
target_doctypes = frappe.get_all(
|
||||||
doctype,
|
doctype,
|
||||||
filters={"inter_company_invoice_reference": reference_name, "docstatus": 1},
|
filters=filters,
|
||||||
as_list=True,
|
as_list=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -381,7 +381,11 @@ 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:
|
||||||
field = "incoming_rate" if self.get("is_internal_supplier") else "rate"
|
field = (
|
||||||
|
"incoming_rate"
|
||||||
|
if self.get("is_internal_supplier") and not self.doctype == "Purchase Order"
|
||||||
|
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),
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user