Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: validate 0 transfer qty in stock entry (#30476)

Browse Source
This commit is contained in:
Ankush Menat 2022-03-29 17:19:22 +05:30 committed by GitHub
parent b12fe0f15b
commit b80fac03af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,12 +225,16 @@ class StockEntry(StockController):
def set_transfer_qty(self): def set_transfer_qty(self):
for item in self.get("items"): for item in self.get("items"):
if not flt(item.qty): if not flt(item.qty):
frappe.throw(_("Row {0}: Qty is mandatory").format(item.idx)) frappe.throw(_("Row {0}: Qty is mandatory").format(item.idx), title=_("Zero quantity"))
if not flt(item.conversion_factor): if not flt(item.conversion_factor):
frappe.throw(_("Row {0}: UOM Conversion Factor is mandatory").format(item.idx)) frappe.throw(_("Row {0}: UOM Conversion Factor is mandatory").format(item.idx))
item.transfer_qty = flt( item.transfer_qty = flt(
flt(item.qty) * flt(item.conversion_factor), self.precision("transfer_qty", item) flt(item.qty) * flt(item.conversion_factor), self.precision("transfer_qty", item)
) )
if not flt(item.transfer_qty):
frappe.throw(
_("Row {0}: Qty in Stock UOM can not be zero.").format(item.idx), title=_("Zero quantity")
)
def update_cost_in_project(self): def update_cost_in_project(self):
if self.work_order and not frappe.db.get_value( if self.work_order and not frappe.db.get_value(

48
erpnext/stock/doctype/stock_entry/test_stock_entry.py
View File

@ -51,7 +51,6 @@ class TestStockEntry(FrappeTestCase):
def tearDown(self): def tearDown(self):
frappe.db.rollback() frappe.db.rollback()
frappe.set_user("Administrator") frappe.set_user("Administrator")
frappe.db.set_value("Manufacturing Settings", None, "material_consumption", "0")
def test_fifo(self): def test_fifo(self):
frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1) frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
@ -767,13 +766,12 @@ class TestStockEntry(FrappeTestCase):
fg_cost, flt(rm_cost + bom_operation_cost + work_order.additional_operating_cost, 2) fg_cost, flt(rm_cost + bom_operation_cost + work_order.additional_operating_cost, 2)
) )
@change_settings("Manufacturing Settings", {"material_consumption": 1})
def test_work_order_manufacture_with_material_consumption(self): def test_work_order_manufacture_with_material_consumption(self):
from erpnext.manufacturing.doctype.work_order.work_order import ( from erpnext.manufacturing.doctype.work_order.work_order import (
make_stock_entry as _make_stock_entry, make_stock_entry as _make_stock_entry,
) )
frappe.db.set_value("Manufacturing Settings", None, "material_consumption", "1")
bom_no = frappe.db.get_value("BOM", {"item": "_Test FG Item", "is_default": 1, "docstatus": 1}) bom_no = frappe.db.get_value("BOM", {"item": "_Test FG Item", "is_default": 1, "docstatus": 1})
work_order = frappe.new_doc("Work Order") work_order = frappe.new_doc("Work Order")
@ -983,43 +981,6 @@ class TestStockEntry(FrappeTestCase):
repack.insert() repack.insert()
self.assertRaises(frappe.ValidationError, repack.submit) self.assertRaises(frappe.ValidationError, repack.submit)
# def test_material_consumption(self):
# frappe.db.set_value("Manufacturing Settings", None, "backflush_raw_materials_based_on", "BOM")
# frappe.db.set_value("Manufacturing Settings", None, "material_consumption", "0")
# from erpnext.manufacturing.doctype.work_order.work_order \
# import make_stock_entry as _make_stock_entry
# bom_no = frappe.db.get_value("BOM", {"item": "_Test FG Item 2",
# "is_default": 1, "docstatus": 1})
# work_order = frappe.new_doc("Work Order")
# work_order.update({
# "company": "_Test Company",
# "fg_warehouse": "_Test Warehouse 1 - _TC",
# "production_item": "_Test FG Item 2",
# "bom_no": bom_no,
# "qty": 4.0,
# "stock_uom": "_Test UOM",
# "wip_warehouse": "_Test Warehouse - _TC",
# "additional_operating_cost": 1000,
# "use_multi_level_bom": 1
# })
# work_order.insert()
# work_order.submit()
# make_stock_entry(item_code="_Test Serialized Item With Series", target="_Test Warehouse - _TC", qty=50, basic_rate=100)
# make_stock_entry(item_code="_Test Item 2", target="_Test Warehouse - _TC", qty=50, basic_rate=20)
# item_quantity = {
# '_Test Item': 2.0,
# '_Test Item 2': 12.0,
# '_Test Serialized Item With Series': 6.0
# }
# stock_entry = frappe.get_doc(_make_stock_entry(work_order.name, "Material Consumption for Manufacture", 2))
# for d in stock_entry.get('items'):
# self.assertEqual(item_quantity.get(d.item_code), d.qty)
def test_customer_provided_parts_se(self): def test_customer_provided_parts_se(self):
create_item( create_item(
"CUST-0987", is_customer_provided_item=1, customer="_Test Customer", is_purchase_item=0 "CUST-0987", is_customer_provided_item=1, customer="_Test Customer", is_purchase_item=0
@ -1358,6 +1319,13 @@ class TestStockEntry(FrappeTestCase):
issue.reload() # reload because reposting current voucher updates rate issue.reload() # reload because reposting current voucher updates rate
self.assertEqual(issue.value_difference, -30) self.assertEqual(issue.value_difference, -30)
def test_transfer_qty_validation(self):
se = make_stock_entry(item_code="_Test Item", do_not_save=True, qty=0.001, rate=100)
se.items[0].uom = "Kg"
se.items[0].conversion_factor = 0.002
self.assertRaises(frappe.ValidationError, se.save)
def make_serialized_item(**args): def make_serialized_item(**args):
args = frappe._dict(args) args = frappe._dict(args)