Merge pull request #5342 from rohitwaghchaure/support_week_2
[Fix] Removed is_pro_applicable
This commit is contained in:
commit
9f5ff9476e
@ -300,7 +300,7 @@ cur_frm.fields_dict['production_item'].get_query = function(doc) {
|
|||||||
return {
|
return {
|
||||||
query: "erpnext.controllers.queries.item_query",
|
query: "erpnext.controllers.queries.item_query",
|
||||||
filters:{
|
filters:{
|
||||||
'is_pro_applicable': 1,
|
'is_stock_item': 1,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -101,7 +101,7 @@ cur_frm.fields_dict['sales_orders'].grid.get_field('sales_order').get_query = fu
|
|||||||
|
|
||||||
cur_frm.fields_dict['items'].grid.get_field('item_code').get_query = function(doc) {
|
cur_frm.fields_dict['items'].grid.get_field('item_code').get_query = function(doc) {
|
||||||
return erpnext.queries.item({
|
return erpnext.queries.item({
|
||||||
'is_pro_applicable': 1
|
'is_stock_item': 1
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -103,11 +103,6 @@ frappe.ui.form.on("Item", {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
is_stock_item: function(frm) {
|
|
||||||
if(frm.doc.is_pro_applicable && !frm.doc.is_stock_item)
|
|
||||||
frm.set_value("is_pro_applicable", 0);
|
|
||||||
},
|
|
||||||
|
|
||||||
has_variants: function(frm) {
|
has_variants: function(frm) {
|
||||||
erpnext.item.toggle_attributes(frm);
|
erpnext.item.toggle_attributes(frm);
|
||||||
}
|
}
|
||||||
|
@ -9,7 +9,6 @@
|
|||||||
"has_serial_no": 0,
|
"has_serial_no": 0,
|
||||||
"income_account": "Sales - _TC",
|
"income_account": "Sales - _TC",
|
||||||
"inspection_required": 0,
|
"inspection_required": 0,
|
||||||
"is_pro_applicable": 0,
|
|
||||||
"is_stock_item": 1,
|
"is_stock_item": 1,
|
||||||
"is_sub_contracted_item": 0,
|
"is_sub_contracted_item": 0,
|
||||||
"item_code": "_Test Item",
|
"item_code": "_Test Item",
|
||||||
@ -38,7 +37,6 @@
|
|||||||
"has_serial_no": 0,
|
"has_serial_no": 0,
|
||||||
"income_account": "Sales - _TC",
|
"income_account": "Sales - _TC",
|
||||||
"inspection_required": 0,
|
"inspection_required": 0,
|
||||||
"is_pro_applicable": 0,
|
|
||||||
"is_stock_item": 1,
|
"is_stock_item": 1,
|
||||||
"is_sub_contracted_item": 0,
|
"is_sub_contracted_item": 0,
|
||||||
"item_code": "_Test Item 2",
|
"item_code": "_Test Item 2",
|
||||||
@ -58,7 +56,6 @@
|
|||||||
"has_serial_no": 0,
|
"has_serial_no": 0,
|
||||||
"income_account": "Sales - _TC",
|
"income_account": "Sales - _TC",
|
||||||
"inspection_required": 0,
|
"inspection_required": 0,
|
||||||
"is_pro_applicable": 0,
|
|
||||||
"is_stock_item": 1,
|
"is_stock_item": 1,
|
||||||
"is_sub_contracted_item": 0,
|
"is_sub_contracted_item": 0,
|
||||||
"item_code": "_Test Item Home Desktop 100",
|
"item_code": "_Test Item Home Desktop 100",
|
||||||
@ -84,7 +81,6 @@
|
|||||||
"has_serial_no": 0,
|
"has_serial_no": 0,
|
||||||
"income_account": "Sales - _TC",
|
"income_account": "Sales - _TC",
|
||||||
"inspection_required": 0,
|
"inspection_required": 0,
|
||||||
"is_pro_applicable": 0,
|
|
||||||
"is_sub_contracted_item": 0,
|
"is_sub_contracted_item": 0,
|
||||||
"item_code": "_Test Item Home Desktop 200",
|
"item_code": "_Test Item Home Desktop 200",
|
||||||
"item_group": "_Test Item Group Desktops",
|
"item_group": "_Test Item Group Desktops",
|
||||||
@ -100,7 +96,6 @@
|
|||||||
"has_serial_no": 0,
|
"has_serial_no": 0,
|
||||||
"income_account": "Sales - _TC",
|
"income_account": "Sales - _TC",
|
||||||
"inspection_required": 0,
|
"inspection_required": 0,
|
||||||
"is_pro_applicable": 0,
|
|
||||||
"is_stock_item": 0,
|
"is_stock_item": 0,
|
||||||
"is_sub_contracted_item": 0,
|
"is_sub_contracted_item": 0,
|
||||||
"item_code": "_Test Product Bundle Item",
|
"item_code": "_Test Product Bundle Item",
|
||||||
@ -118,7 +113,6 @@
|
|||||||
"has_serial_no": 0,
|
"has_serial_no": 0,
|
||||||
"income_account": "Sales - _TC",
|
"income_account": "Sales - _TC",
|
||||||
"inspection_required": 0,
|
"inspection_required": 0,
|
||||||
"is_pro_applicable": 1,
|
|
||||||
"is_stock_item": 1,
|
"is_stock_item": 1,
|
||||||
"is_sub_contracted_item": 1,
|
"is_sub_contracted_item": 1,
|
||||||
"item_code": "_Test FG Item",
|
"item_code": "_Test FG Item",
|
||||||
@ -132,7 +126,6 @@
|
|||||||
"has_batch_no": 0,
|
"has_batch_no": 0,
|
||||||
"has_serial_no": 0,
|
"has_serial_no": 0,
|
||||||
"inspection_required": 0,
|
"inspection_required": 0,
|
||||||
"is_pro_applicable": 0,
|
|
||||||
"is_stock_item": 0,
|
"is_stock_item": 0,
|
||||||
"is_sub_contracted_item": 0,
|
"is_sub_contracted_item": 0,
|
||||||
"item_code": "_Test Non Stock Item",
|
"item_code": "_Test Non Stock Item",
|
||||||
@ -147,7 +140,6 @@
|
|||||||
"has_batch_no": 0,
|
"has_batch_no": 0,
|
||||||
"has_serial_no": 1,
|
"has_serial_no": 1,
|
||||||
"inspection_required": 0,
|
"inspection_required": 0,
|
||||||
"is_pro_applicable": 0,
|
|
||||||
"is_stock_item": 1,
|
"is_stock_item": 1,
|
||||||
"is_sub_contracted_item": 0,
|
"is_sub_contracted_item": 0,
|
||||||
"item_code": "_Test Serialized Item",
|
"item_code": "_Test Serialized Item",
|
||||||
@ -162,7 +154,6 @@
|
|||||||
"has_batch_no": 0,
|
"has_batch_no": 0,
|
||||||
"has_serial_no": 1,
|
"has_serial_no": 1,
|
||||||
"inspection_required": 0,
|
"inspection_required": 0,
|
||||||
"is_pro_applicable": 0,
|
|
||||||
"is_stock_item": 1,
|
"is_stock_item": 1,
|
||||||
"is_sub_contracted_item": 0,
|
"is_sub_contracted_item": 0,
|
||||||
"item_code": "_Test Serialized Item With Series",
|
"item_code": "_Test Serialized Item With Series",
|
||||||
@ -181,7 +172,6 @@
|
|||||||
"has_serial_no": 0,
|
"has_serial_no": 0,
|
||||||
"income_account": "Sales - _TC",
|
"income_account": "Sales - _TC",
|
||||||
"inspection_required": 0,
|
"inspection_required": 0,
|
||||||
"is_pro_applicable": 1,
|
|
||||||
"is_stock_item": 1,
|
"is_stock_item": 1,
|
||||||
"is_sub_contracted_item": 0,
|
"is_sub_contracted_item": 0,
|
||||||
"item_code": "_Test Item Home Desktop Manufactured",
|
"item_code": "_Test Item Home Desktop Manufactured",
|
||||||
@ -199,7 +189,6 @@
|
|||||||
"has_serial_no": 0,
|
"has_serial_no": 0,
|
||||||
"income_account": "Sales - _TC",
|
"income_account": "Sales - _TC",
|
||||||
"inspection_required": 0,
|
"inspection_required": 0,
|
||||||
"is_pro_applicable": 1,
|
|
||||||
"is_stock_item": 1,
|
"is_stock_item": 1,
|
||||||
"is_sub_contracted_item": 1,
|
"is_sub_contracted_item": 1,
|
||||||
"item_code": "_Test FG Item 2",
|
"item_code": "_Test FG Item 2",
|
||||||
@ -217,7 +206,6 @@
|
|||||||
"has_serial_no": 0,
|
"has_serial_no": 0,
|
||||||
"income_account": "Sales - _TC",
|
"income_account": "Sales - _TC",
|
||||||
"inspection_required": 0,
|
"inspection_required": 0,
|
||||||
"is_pro_applicable": 1,
|
|
||||||
"is_stock_item": 1,
|
"is_stock_item": 1,
|
||||||
"is_sub_contracted_item": 1,
|
"is_sub_contracted_item": 1,
|
||||||
"item_code": "_Test Variant Item",
|
"item_code": "_Test Variant Item",
|
||||||
|
Loading…
Reference in New Issue
Block a user