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

chore: remove rate of material based on Manual

Browse Source
This commit is contained in:
Rohit Waghchaure
2024-04-02 16:24:02 +05:30
parent 271fea69b8
commit 0b63dbf221
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/manufacturing/doctype/bom/bom.json
View File

@@ -238,7 +238,7 @@
"fieldname": "rm_cost_as_per", "fieldname": "rm_cost_as_per",
"fieldtype": "Select", "fieldtype": "Select",
"label": "Rate Of Materials Based On", "label": "Rate Of Materials Based On",
"options": "Valuation Rate\nLast Purchase Rate\nPrice List\nManual" "options": "Valuation Rate\nLast Purchase Rate\nPrice List"
}, },
{ {
"allow_on_submit": 1, "allow_on_submit": 1,
@@ -637,7 +637,7 @@
"image_field": "image", "image_field": "image",
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2024-03-27 13:06:40.214929", "modified": "2024-04-02 16:22:47.518411",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "BOM", "name": "BOM",

7
erpnext/manufacturing/doctype/bom/bom.py
View File

@@ -147,7 +147,7 @@ class BOM(WebsiteGenerator):
quality_inspection_template: DF.Link | None quality_inspection_template: DF.Link | None
quantity: DF.Float quantity: DF.Float
raw_material_cost: DF.Currency raw_material_cost: DF.Currency
rm_cost_as_per: DF.Literal["Valuation Rate", "Last Purchase Rate", "Price List", "Manual"] rm_cost_as_per: DF.Literal["Valuation Rate", "Last Purchase Rate", "Price List"]
route: DF.SmallText | None route: DF.SmallText | None
routing: DF.Link | None routing: DF.Link | None
scrap_items: DF.Table[BOMScrapItem] scrap_items: DF.Table[BOMScrapItem]
@@ -737,6 +737,7 @@ class BOM(WebsiteGenerator):
def calculate_rm_cost(self, save=False): def calculate_rm_cost(self, save=False):
"""Fetch RM rate as per today's valuation rate and calculate totals""" """Fetch RM rate as per today's valuation rate and calculate totals"""
total_rm_cost = 0 total_rm_cost = 0
base_total_rm_cost = 0 base_total_rm_cost = 0
@@ -745,7 +746,7 @@ class BOM(WebsiteGenerator):
continue continue
old_rate = d.rate old_rate = d.rate
if self.rm_cost_as_per != "Manual": if not self.bom_creator:
d.rate = self.get_rm_rate( d.rate = self.get_rm_rate(
{ {
"company": self.company, "company": self.company,
@@ -1017,8 +1018,6 @@ def get_bom_item_rate(args, bom_doc):
item_doc = frappe.get_cached_doc("Item", args.get("item_code")) item_doc = frappe.get_cached_doc("Item", args.get("item_code"))
price_list_data = get_price_list_rate(bom_args, item_doc) price_list_data = get_price_list_rate(bom_args, item_doc)
rate = price_list_data.price_list_rate rate = price_list_data.price_list_rate
elif bom_doc.rm_cost_as_per == "Manual":
return
return flt(rate) return flt(rate)

4
erpnext/manufacturing/doctype/bom_creator/bom_creator.json
View File

@@ -66,7 +66,7 @@
"fieldname": "rm_cost_as_per", "fieldname": "rm_cost_as_per",
"fieldtype": "Select", "fieldtype": "Select",
"label": "Rate Of Materials Based On", "label": "Rate Of Materials Based On",
"options": "Valuation Rate\nLast Purchase Rate\nPrice List\nManual", "options": "Valuation Rate\nLast Purchase Rate\nPrice List",
"reqd": 1 "reqd": 1
}, },
{ {
@@ -288,7 +288,7 @@
"link_fieldname": "bom_creator" "link_fieldname": "bom_creator"
} }
], ],
"modified": "2024-03-27 13:06:40.535884", "modified": "2024-04-02 16:30:59.779190",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "BOM Creator", "name": "BOM Creator",

6
erpnext/manufacturing/doctype/bom_creator/bom_creator.py
View File

@@ -59,7 +59,7 @@ class BOMCreator(Document):
qty: DF.Float qty: DF.Float
raw_material_cost: DF.Currency raw_material_cost: DF.Currency
remarks: DF.TextEditor | None remarks: DF.TextEditor | None
rm_cost_as_per: DF.Literal["Valuation Rate", "Last Purchase Rate", "Price List", "Manual"] rm_cost_as_per: DF.Literal["Valuation Rate", "Last Purchase Rate", "Price List"]
set_rate_based_on_warehouse: DF.Check set_rate_based_on_warehouse: DF.Check
status: DF.Literal["Draft", "Submitted", "In Progress", "Completed", "Failed", "Cancelled"] status: DF.Literal["Draft", "Submitted", "In Progress", "Completed", "Failed", "Cancelled"]
uom: DF.Link | None uom: DF.Link | None
@@ -141,9 +141,6 @@ class BOMCreator(Document):
self.submit() self.submit()
def set_rate_for_items(self): def set_rate_for_items(self):
if self.rm_cost_as_per == "Manual":
return
amount = self.get_raw_material_cost() amount = self.get_raw_material_cost()
self.raw_material_cost = amount self.raw_material_cost = amount
@@ -282,7 +279,6 @@ class BOMCreator(Document):
"allow_alternative_item": 1, "allow_alternative_item": 1,
"bom_creator": self.name, "bom_creator": self.name,
"bom_creator_item": bom_creator_item, "bom_creator_item": bom_creator_item,
"rm_cost_as_per": "Manual",
} }
) )