Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: get Valuation Rate instead of BOM rate

Browse Source
This commit is contained in:
s-aga-r 2023-08-28 16:09:05 +05:30
parent 592c7b5ff1
commit 9d330a13ed
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
View File

@ -8,6 +8,7 @@ from frappe.utils import cint, flt, getdate, nowdate
import erpnext import erpnext
from erpnext.accounts.utils import get_account_currency from erpnext.accounts.utils import get_account_currency
from erpnext.controllers.subcontracting_controller import SubcontractingController from erpnext.controllers.subcontracting_controller import SubcontractingController
from erpnext.stock.stock_ledger import get_valuation_rate
class SubcontractingReceipt(SubcontractingController): class SubcontractingReceipt(SubcontractingController):
@ -159,6 +160,17 @@ class SubcontractingReceipt(SubcontractingController):
bom = frappe.get_doc("BOM", item.bom) bom = frappe.get_doc("BOM", item.bom)
for scrap_item in bom.scrap_items: for scrap_item in bom.scrap_items:
qty = flt(item.qty) * (flt(scrap_item.stock_qty) / flt(bom.quantity)) qty = flt(item.qty) * (flt(scrap_item.stock_qty) / flt(bom.quantity))
rate = (
get_valuation_rate(
scrap_item.item_code,
self.set_warehouse,
self.doctype,
self.name,
currency=erpnext.get_company_currency(self.company),
company=self.company,
)
or scrap_item.rate
)
self.append( self.append(
"items", "items",
{ {
@ -169,12 +181,12 @@ class SubcontractingReceipt(SubcontractingController):
"qty": qty, "qty": qty,
"stock_uom": scrap_item.stock_uom, "stock_uom": scrap_item.stock_uom,
"recalculate_rate": 0, "recalculate_rate": 0,
"rate": scrap_item.rate, "rate": rate,
"rm_cost_per_qty": 0, "rm_cost_per_qty": 0,
"service_cost_per_qty": 0, "service_cost_per_qty": 0,
"additional_cost_per_qty": 0, "additional_cost_per_qty": 0,
"scrap_cost_per_qty": 0, "scrap_cost_per_qty": 0,
"amount": qty * scrap_item.rate, "amount": qty * rate,
"warehouse": self.set_warehouse, "warehouse": self.set_warehouse,
"rejected_warehouse": self.rejected_warehouse, "rejected_warehouse": self.rejected_warehouse,
}, },