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

fix: remove redundant method

Browse Source 
(cherry picked from commit 57d5a027fb929803ffd62463da3e5b4611b17ff4)
This commit is contained in:
Saqib Ansari 2022-02-21 13:58:01 +05:30 committed by mergify-bot
parent 5d3b65b944
commit 414c3b8dd2
2 changed files with 13 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
erpnext/assets/doctype/asset_repair/asset_repair.js
View File

@ -69,18 +69,23 @@ frappe.ui.form.on('Asset Repair', {
frappe.ui.form.on('Asset Repair Consumed Item', {
item_code: function(frm, cdt, cdn) {
var row = locals[cdt][cdn];
var item = locals[cdt][cdn];
frappe.call ({
method: "erpnext.assets.doctype.asset_repair.asset_repair.get_valuation_rate",
let item_args = {
'item_code': item.item_code,
'warehouse': frm.doc.warehouse,
'qty': item.consumed_quantity,
'serial_no': item.serial_no,
'company': frm.doc.company
}
frappe.call({
method: 'erpnext.stock.utils.get_incoming_rate',
args: {
"item_code": row.item_code,
"warehouse": frm.doc.warehouse
args: item_args
},
callback: function(r) {
if(r.message) {
frappe.model.set_value(cdt, cdn, 'valuation_rate', r.message);
}
frappe.model.set_value(cdt, cdn, 'valuation_rate', r.message);
}
});
},

33
erpnext/assets/doctype/asset_repair/asset_repair.py
View File

@ -256,36 +256,3 @@ class AssetRepair(AccountsController):
def get_downtime(failure_date, completion_date):
downtime = time_diff_in_hours(completion_date, failure_date)
return round(downtime, 2)
@frappe.whitelist()
def get_valuation_rate(item_code, warehouse):
last_valuation_rate = frappe.get_all(
"Stock Ledger Entry",
filters = {
"item_code": item_code,
"warehouse": warehouse,
"valuation_rate": [">=", 0],
"docstatus": ["<", 2]
},
pluck = "valuation_rate",
order_by = "posting_date desc, posting_time desc, name desc"
)
if last_valuation_rate:
return last_valuation_rate[0]
else:
valuation_rate = frappe.db.get_value("Item", item_code, "valuation_rate")
if not valuation_rate:
# try Item Standard rate
valuation_rate = frappe.db.get_value("Item", item_code, "standard_rate")
if not valuation_rate:
# try in price list
valuation_rate = frappe.db.get_value(
"Item Price",
dict(item_code=item_code, buying=1),
"price_list_rate"
)
return valuation_rate