schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor!: change "is_subcontracted" field type from "Select" to "Check"

Browse Source
This commit is contained in:
Sagar Sharma
2022-04-19 14:57:31 +05:30
parent 249726b845
commit 409df263e8
41 changed files with 127 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/controllers/buying_controller.py
View File

@@ -167,7 +167,7 @@ class BuyingController(StockController, Subcontracting):
_("Row #{0}: Accepted Warehouse and Supplier Warehouse cannot be same").format(item.idx)
)
if item.get("from_warehouse") and self.get("is_subcontracted") == "Yes":
if item.get("from_warehouse") and self.get("is_subcontracted"):
frappe.throw(
_(
"Row #{0}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor"
@@ -339,10 +339,7 @@ class BuyingController(StockController, Subcontracting):
return supplied_items_cost
def validate_for_subcontracting(self):
if not self.is_subcontracted and self.sub_contracted_items:
frappe.throw(_("Please enter 'Is Subcontracted' as Yes or No"))
if self.is_subcontracted == "Yes":
if self.is_subcontracted:
if self.doctype in ["Purchase Receipt", "Purchase Invoice"] and not self.supplier_warehouse:
frappe.throw(_("Supplier Warehouse mandatory for sub-contracted {0}").format(self.doctype))
@@ -363,14 +360,14 @@ class BuyingController(StockController, Subcontracting):
item.bom = None
def create_raw_materials_supplied(self, raw_material_table):
if self.is_subcontracted == "Yes":
if self.is_subcontracted:
self.set_materials_for_subcontracted_items(raw_material_table)
elif self.doctype in ["Purchase Receipt", "Purchase Invoice"]:
for item in self.get("items"):
item.rm_supp_cost = 0.0
if self.is_subcontracted == "No" and self.get("supplied_items"):
if not self.is_subcontracted and self.get("supplied_items"):
self.set("supplied_items", [])
@property