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

Add 'Shelf Life' (Item) and Manufacturing date (Batch) (#12381)

Browse Source 
* fix bug in batch number selector. fetch and display batch numbers only for the given item code.

* remove print statement

* Fix error on selecting Chattisgarh in address

Fix error on selecting Chattisgarh in address because of spelling mistake

* Revert "Fix error on selecting Chattisgarh in address"

* Add Shelf Life (Item) and Manufacturing Date (Batch) fields

* remove console.log

* fix ci issues

* Update batch.js
This commit is contained in:
Sachin Mane 2018-01-11 12:45:51 +05:30 committed by Nabin Hait
parent 47ad7fb129
commit 24e2735e19
3 changed files with 497 additions and 429 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,3 +147,11 @@ frappe.ui.form.on('Batch', {
}
})
frappe.ui.form.on('Batch', 'manufacturing_date', function (frm){
frappe.db.get_value('Item', {name: frm.doc.item}, ['shelf_life_in_days', 'has_expiry_date'], (r) => {
if (r.has_expiry_date && r.shelf_life_in_days) {
// Calculate expiry date based on shelf_life_in_days
frm.set_value('expiry_date', frappe.datetime.add_days(frm.doc.manufacturing_date, r.shelf_life_in_days));
}
})
})

36
erpnext/stock/doctype/batch/batch.json
View File

@ -27,7 +27,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Batch ID",
"length": 0,
@ -58,7 +58,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_list_view": 1,
"in_standard_filter": 1,
"label": "Item",
"length": 0,
@ -168,6 +168,36 @@
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "manufacturing_date",
"fieldtype": "Date",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Manufacturing Date",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@ -425,7 +455,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 5,
"modified": "2017-05-21 21:00:11.096038",
"modified": "2018-01-08 21:55:54.306693",
"modified_by": "Administrator",
"module": "Stock",
"name": "Batch",

32
erpnext/stock/doctype/item/item.json
View File

@ -768,6 +768,36 @@
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "shelf_life_in_days",
"fieldtype": "Int",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Shelf Life In Days",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@ -3454,7 +3484,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 1,
"modified": "2017-12-29 14:18:37.731142",
"modified": "2018-01-08 21:53:55.895525",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item",