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

Disallowed End of Life Items from getting selected in Production Orders and Stock Reconciliation

Browse Source
This commit is contained in:
Neil Trini Lasrado 2015-07-21 13:27:18 +05:30
parent 9257413b68
commit 9c3dca63fa
4 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/manufacturing/doctype/production_order/production_order.js
View File

@ -262,7 +262,8 @@ cur_frm.fields_dict['production_item'].get_query = function(doc) {
return {
filters:[
['Item', 'is_pro_applicable', '=', 'Yes'],
['Item', 'has_variants', '=', 'No']
['Item', 'has_variants', '=', 'No'],
['Item', 'end_of_life', '>', frappe.datetime.now_datetime()]
]
}
}

3
erpnext/manufacturing/doctype/production_order/production_order.py
View File

@ -9,6 +9,7 @@ from frappe import _
from frappe.model.document import Document
from erpnext.manufacturing.doctype.bom.bom import validate_bom_no
from dateutil.relativedelta import relativedelta
from erpnext.stock.doctype.item.item import validate_end_of_life
class OverProductionError(frappe.ValidationError): pass
class StockOverProductionError(frappe.ValidationError): pass
@ -329,6 +330,8 @@ class ProductionOrder(Document):
if frappe.db.get_value("Item", self.production_item, "has_variants"):
frappe.throw(_("Production Order cannot be raised against a Item Template"))
validate_end_of_life(self.production_item)
@frappe.whitelist()
def get_item_details(item):

6
erpnext/manufacturing/doctype/production_order/test_production_order.py
View File

@ -135,6 +135,12 @@ class TestProductionOrder(unittest.TestCase):
prod_order.set_production_order_operations()
self.assertEqual(prod_order.planned_operating_cost, cost*2)
def test_production_item(self):
item = frappe.get_doc("Item", "_Test FG Item")
item.end_of_life =
prod_order = make_prod_order_test_record(item="_Test FG Item", qty=1, do_not_save=True)
def make_prod_order_test_record(**args):
args = frappe._dict(args)

8
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
View File

@ -98,3 +98,11 @@ cur_frm.cscript.company = function(doc, cdt, cdn) {
cur_frm.cscript.posting_date = function(doc, cdt, cdn){
erpnext.get_fiscal_year(doc.company, doc.posting_date);
}
cur_frm.fields_dict.items.grid.get_field('item_code').get_query = function(doc, cdt, cdn) {
return {
filters:[
['Item', 'end_of_life', '>', frappe.datetime.now_datetime()]
]
}
}