mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-15 19:19:17 +00:00
refactor(subcontracting): add arg type hints to functions
This commit is contained in:
@@ -84,7 +84,7 @@ class SubcontractingBOM(Document):
|
|||||||
|
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def get_subcontracting_boms_for_finished_goods(fg_items: str | list) -> dict:
|
def get_subcontracting_boms_for_finished_goods(fg_items: str | list):
|
||||||
if fg_items:
|
if fg_items:
|
||||||
filters = {"is_active": 1}
|
filters = {"is_active": 1}
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
import frappe
|
import frappe
|
||||||
from frappe import _
|
from frappe import _
|
||||||
|
from frappe.model.document import Document
|
||||||
from frappe.model.mapper import get_mapped_doc
|
from frappe.model.mapper import get_mapped_doc
|
||||||
from frappe.utils import comma_and, flt, get_link_to_form
|
from frappe.utils import comma_and, flt, get_link_to_form
|
||||||
|
|
||||||
@@ -322,7 +323,7 @@ class SubcontractingInwardOrder(SubcontractingController):
|
|||||||
frappe.msgprint(_("{0} created").format(comma_and(doc_list)))
|
frappe.msgprint(_("{0} created").format(comma_and(doc_list)))
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def make_rm_stock_entry_inward(self, target_doc=None):
|
def make_rm_stock_entry_inward(self, target_doc: Document | str | None = None):
|
||||||
def calculate_qty_as_per_bom(rm_item):
|
def calculate_qty_as_per_bom(rm_item):
|
||||||
data = frappe.get_value(
|
data = frappe.get_value(
|
||||||
"Subcontracting Inward Order Item",
|
"Subcontracting Inward Order Item",
|
||||||
@@ -385,7 +386,7 @@ class SubcontractingInwardOrder(SubcontractingController):
|
|||||||
return stock_entry.as_dict()
|
return stock_entry.as_dict()
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def make_rm_return(self, target_doc=None):
|
def make_rm_return(self, target_doc: Document | str | None = None):
|
||||||
if target_doc and target_doc.get("items"):
|
if target_doc and target_doc.get("items"):
|
||||||
target_doc.items = []
|
target_doc.items = []
|
||||||
|
|
||||||
@@ -426,7 +427,7 @@ class SubcontractingInwardOrder(SubcontractingController):
|
|||||||
return stock_entry.as_dict()
|
return stock_entry.as_dict()
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def make_subcontracting_delivery(self, target_doc=None):
|
def make_subcontracting_delivery(self, target_doc: Document | str | None = None):
|
||||||
if target_doc and target_doc.get("items"):
|
if target_doc and target_doc.get("items"):
|
||||||
target_doc.items = []
|
target_doc.items = []
|
||||||
|
|
||||||
@@ -502,7 +503,7 @@ class SubcontractingInwardOrder(SubcontractingController):
|
|||||||
return stock_entry.as_dict()
|
return stock_entry.as_dict()
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def make_subcontracting_return(self, target_doc=None):
|
def make_subcontracting_return(self, target_doc: Document | str | None = None):
|
||||||
if target_doc and target_doc.get("items"):
|
if target_doc and target_doc.get("items"):
|
||||||
target_doc.items = []
|
target_doc.items = []
|
||||||
|
|
||||||
@@ -548,7 +549,7 @@ class SubcontractingInwardOrder(SubcontractingController):
|
|||||||
|
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def update_subcontracting_inward_order_status(scio, status=None):
|
def update_subcontracting_inward_order_status(scio: str | Document, status: str | None = None):
|
||||||
if isinstance(scio, str):
|
if isinstance(scio, str):
|
||||||
scio = frappe.get_doc("Subcontracting Inward Order", scio)
|
scio = frappe.get_doc("Subcontracting Inward Order", scio)
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
import frappe
|
import frappe
|
||||||
from frappe import _
|
from frappe import _
|
||||||
|
from frappe.model.document import Document
|
||||||
from frappe.model.mapper import get_mapped_doc
|
from frappe.model.mapper import get_mapped_doc
|
||||||
from frappe.utils import flt
|
from frappe.utils import flt
|
||||||
|
|
||||||
@@ -363,7 +364,7 @@ class SubcontractingOrder(SubcontractingController):
|
|||||||
)
|
)
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def reserve_raw_materials(self, items=None, stock_entry=None):
|
def reserve_raw_materials(self, items: list | None = None, stock_entry: str | None = None):
|
||||||
if self.reserve_stock:
|
if self.reserve_stock:
|
||||||
item_dict = {}
|
item_dict = {}
|
||||||
|
|
||||||
@@ -437,7 +438,7 @@ class SubcontractingOrder(SubcontractingController):
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def cancel_stock_reservation_entries(self, sre_list=None, notify=True) -> None:
|
def cancel_stock_reservation_entries(self, sre_list: list | None = None, notify: bool = True):
|
||||||
from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import (
|
from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import (
|
||||||
cancel_stock_reservation_entries,
|
cancel_stock_reservation_entries,
|
||||||
)
|
)
|
||||||
@@ -448,7 +449,7 @@ class SubcontractingOrder(SubcontractingController):
|
|||||||
|
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def make_subcontracting_receipt(source_name, target_doc=None):
|
def make_subcontracting_receipt(source_name: str, target_doc: Document | str | None = None):
|
||||||
items = frappe.flags.args.get("items") if frappe.flags.args else None
|
items = frappe.flags.args.get("items") if frappe.flags.args else None
|
||||||
return get_mapped_subcontracting_receipt(source_name, target_doc, items=items)
|
return get_mapped_subcontracting_receipt(source_name, target_doc, items=items)
|
||||||
|
|
||||||
@@ -495,7 +496,7 @@ def get_mapped_subcontracting_receipt(source_name, target_doc=None, items=None):
|
|||||||
|
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def update_subcontracting_order_status(sco, status=None):
|
def update_subcontracting_order_status(sco: str | Document, status: str | None = None):
|
||||||
if isinstance(sco, str):
|
if isinstance(sco, str):
|
||||||
sco = frappe.get_doc("Subcontracting Order", sco)
|
sco = frappe.get_doc("Subcontracting Order", sco)
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ from collections import defaultdict
|
|||||||
|
|
||||||
import frappe
|
import frappe
|
||||||
from frappe import _
|
from frappe import _
|
||||||
|
from frappe.model.document import Document
|
||||||
from frappe.model.mapper import get_mapped_doc
|
from frappe.model.mapper import get_mapped_doc
|
||||||
from frappe.query_builder.functions import Sum
|
from frappe.query_builder.functions import Sum
|
||||||
from frappe.utils import cint, flt, get_link_to_form, getdate, nowdate
|
from frappe.utils import cint, flt, get_link_to_form, getdate, nowdate
|
||||||
@@ -343,7 +344,7 @@ class SubcontractingReceipt(SubcontractingController):
|
|||||||
self.update_rate_for_supplied_items()
|
self.update_rate_for_supplied_items()
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def get_scrap_items(self, recalculate_rate=False):
|
def get_scrap_items(self, recalculate_rate: bool = False):
|
||||||
self.remove_scrap_items()
|
self.remove_scrap_items()
|
||||||
|
|
||||||
for item in list(self.items):
|
for item in list(self.items):
|
||||||
@@ -930,21 +931,27 @@ class SubcontractingReceipt(SubcontractingController):
|
|||||||
|
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def make_subcontract_return_against_rejected_warehouse(source_name):
|
def make_subcontract_return_against_rejected_warehouse(source_name: str):
|
||||||
from erpnext.controllers.sales_and_purchase_return import make_return_doc
|
from erpnext.controllers.sales_and_purchase_return import make_return_doc
|
||||||
|
|
||||||
return make_return_doc("Subcontracting Receipt", source_name, return_against_rejected_qty=True)
|
return make_return_doc("Subcontracting Receipt", source_name, return_against_rejected_qty=True)
|
||||||
|
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def make_subcontract_return(source_name, target_doc=None):
|
def make_subcontract_return(source_name: str, target_doc: Document | str | None = None):
|
||||||
from erpnext.controllers.sales_and_purchase_return import make_return_doc
|
from erpnext.controllers.sales_and_purchase_return import make_return_doc
|
||||||
|
|
||||||
return make_return_doc("Subcontracting Receipt", source_name, target_doc)
|
return make_return_doc("Subcontracting Receipt", source_name, target_doc)
|
||||||
|
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def make_purchase_receipt(source_name, target_doc=None, save=False, submit=False, notify=False):
|
def make_purchase_receipt(
|
||||||
|
source_name: Document | str,
|
||||||
|
target_doc: Document | str | None = None,
|
||||||
|
save: bool = False,
|
||||||
|
submit: bool = False,
|
||||||
|
notify: bool = False,
|
||||||
|
):
|
||||||
if isinstance(source_name, str):
|
if isinstance(source_name, str):
|
||||||
source_doc = frappe.get_doc("Subcontracting Receipt", source_name)
|
source_doc = frappe.get_doc("Subcontracting Receipt", source_name)
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user