refactor: rename subcontracting fields

This commit is contained in:
Mihir Kandoi
2025-03-02 17:16:17 +05:30
parent 5bee30ff2f
commit b4f65154f5
13 changed files with 58 additions and 38 deletions

View File

@@ -16,14 +16,14 @@ frappe.ui.form.on("Subcontracting Order Item", {
service_item.doctype,
service_item.name,
"qty",
row.qty * row.sc_conversion_factor
row.qty * row.subcontracting_conversion_factor
);
frappe.model.set_value(service_item.doctype, service_item.name, "fg_item_qty", row.qty);
frappe.model.set_value(
service_item.doctype,
service_item.name,
"amount",
row.qty * row.sc_conversion_factor * service_item.rate
row.qty * row.subcontracting_conversion_factor * service_item.rate
);
},
before_items_remove(frm, cdt, cdn) {

View File

@@ -119,12 +119,12 @@ class SubcontractingOrder(SubcontractingController):
def on_submit(self):
self.update_prevdoc_status()
self.update_status()
self.update_sco_qty_in_po()
self.update_subcontracted_quantity_in_po()
def on_cancel(self):
self.update_prevdoc_status()
self.update_status()
self.update_sco_qty_in_po(cancel=True)
self.update_subcontracted_quantity_in_po(cancel=True)
def validate_purchase_order_for_subcontracting(self):
if self.purchase_order:
@@ -162,7 +162,7 @@ class SubcontractingOrder(SubcontractingController):
item = next(
item for item in self.items if item.purchase_order_item == service_item.purchase_order_item
)
service_item.qty = item.qty * item.sc_conversion_factor
service_item.qty = item.qty * item.subcontracting_conversion_factor
service_item.fg_item_qty = item.qty
service_item.amount = service_item.qty * service_item.rate
@@ -250,7 +250,7 @@ class SubcontractingOrder(SubcontractingController):
item = frappe.get_doc("Item", si.fg_item)
po_item = frappe.get_doc("Purchase Order Item", si.purchase_order_item)
available_qty = po_item.qty - po_item.sco_qty
available_qty = po_item.qty - po_item.subcontracted_quantity
if available_qty == 0:
continue
@@ -276,7 +276,7 @@ class SubcontractingOrder(SubcontractingController):
"schedule_date": self.schedule_date,
"description": item.description,
"qty": si.fg_item_qty,
"sc_conversion_factor": conversion_factor,
"subcontracting_conversion_factor": conversion_factor,
"stock_uom": item.stock_uom,
"bom": bom,
"purchase_order_item": si.purchase_order_item,
@@ -330,10 +330,14 @@ class SubcontractingOrder(SubcontractingController):
self.update_ordered_qty_for_subcontracting()
self.update_reserved_qty_for_subcontracting()
def update_sco_qty_in_po(self, cancel=False):
def update_subcontracted_quantity_in_po(self, cancel=False):
for service_item in self.service_items:
doc = frappe.get_doc("Purchase Order Item", service_item.purchase_order_item)
doc.sco_qty = (doc.sco_qty + service_item.qty) if not cancel else (doc.sco_qty - service_item.qty)
doc.subcontracted_quantity = (
(doc.subcontracted_quantity + service_item.qty)
if not cancel
else (doc.subcontracted_quantity - service_item.qty)
)
doc.save()

View File

@@ -55,7 +55,7 @@
"section_break_34",
"purchase_order_item",
"page_break",
"sc_conversion_factor"
"subcontracting_conversion_factor"
],
"fields": [
{
@@ -403,18 +403,19 @@
"fieldtype": "Column Break"
},
{
"fieldname": "sc_conversion_factor",
"fieldname": "subcontracting_conversion_factor",
"fieldtype": "Float",
"hidden": 1,
"label": "SC Conversion Factor",
"label": "Subcontracting Conversion Factor",
"read_only": 1
}
],
"grid_page_length": 50,
"idx": 1,
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2024-12-13 13:35:28.935898",
"modified": "2025-03-02 17:05:28.386492",
"modified_by": "Administrator",
"module": "Subcontracting",
"name": "Subcontracting Order Item",
@@ -422,6 +423,7 @@
"owner": "Administrator",
"permissions": [],
"quick_entry": 1,
"row_format": "Dynamic",
"search_fields": "item_name",
"sort_field": "creation",
"sort_order": "DESC",

View File

@@ -42,10 +42,10 @@ class SubcontractingOrderItem(Document):
received_qty: DF.Float
returned_qty: DF.Float
rm_cost_per_qty: DF.Currency
sc_conversion_factor: DF.Float
schedule_date: DF.Date | None
service_cost_per_qty: DF.Currency
stock_uom: DF.Link
subcontracting_conversion_factor: DF.Float
warehouse: DF.Link
# end: auto-generated types