nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 03:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24221 from rohitwaghchaure/donot-override-valuation-rate

Browse Source 
fix: do not override the manually added valuation rate in stock entry
This commit is contained in:
rohitwaghchaure
2020-12-28 16:43:49 +05:30
committed by GitHub
parent 44dd9f6fe5 b9d62d7f8e
commit 86bbb3e9a0
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@@ -322,11 +322,12 @@ frappe.ui.form.on('Stock Entry', {
method: "erpnext.stock.get_item_details.get_serial_no", method: "erpnext.stock.get_item_details.get_serial_no",
args: {"args": args}, args: {"args": args},
callback: function(r) { callback: function(r) {
if (!r.exe && r.message){ if (!r.exe && r.message) {
frappe.model.set_value(cdt, cdn, "serial_no", r.message); frappe.model.set_value(cdt, cdn, "serial_no", r.message);
}
if (callback) { if (callback) {
callback(); callback();
}
} }
} }
}); });

4
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -83,7 +83,7 @@ class StockEntry(StockController):
self.set_incoming_rate() self.set_incoming_rate()
self.validate_serialized_batch() self.validate_serialized_batch()
self.set_actual_qty() self.set_actual_qty()
self.calculate_rate_and_amount() self.calculate_rate_and_amount(update_finished_item_rate=False)
def on_submit(self): def on_submit(self):
@@ -460,7 +460,7 @@ class StockEntry(StockController):
scrap_material_cost += flt(d.basic_amount) scrap_material_cost += flt(d.basic_amount)
number_of_fg_items = len([t.t_warehouse for t in self.get("items") if t.t_warehouse]) number_of_fg_items = len([t.t_warehouse for t in self.get("items") if t.t_warehouse])
if (fg_basic_rate == 0.0 and number_of_fg_items == 1) or update_finished_item_rate: if number_of_fg_items == 1 or update_finished_item_rate:
self.set_basic_rate_for_finished_goods(raw_material_cost, scrap_material_cost) self.set_basic_rate_for_finished_goods(raw_material_cost, scrap_material_cost)
def get_args_for_incoming_rate(self, item): def get_args_for_incoming_rate(self, item):