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

Merge pull request #5342 from rohitwaghchaure/support_week_2

Browse Source 
[Fix] Removed is_pro_applicable
This commit is contained in:
Rushabh Mehta 2016-05-16 12:02:01 +05:30
commit 9f5ff9476e
4 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -300,7 +300,7 @@ cur_frm.fields_dict['production_item'].get_query = function(doc) {
return {
query: "erpnext.controllers.queries.item_query",
filters:{
'is_pro_applicable': 1,
'is_stock_item': 1,
}
}
}

2
erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js
View File

@ -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) {
return erpnext.queries.item({
'is_pro_applicable': 1
'is_stock_item': 1
});
}

5
erpnext/stock/doctype/item/item.js
View File

@ -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) {
erpnext.item.toggle_attributes(frm);
}

12
erpnext/stock/doctype/item/test_records.json
View File

@ -9,7 +9,6 @@
"has_serial_no": 0,
"income_account": "Sales - _TC",
"inspection_required": 0,
"is_pro_applicable": 0,
"is_stock_item": 1,
"is_sub_contracted_item": 0,
"item_code": "_Test Item",
@ -38,7 +37,6 @@
"has_serial_no": 0,
"income_account": "Sales - _TC",
"inspection_required": 0,
"is_pro_applicable": 0,
"is_stock_item": 1,
"is_sub_contracted_item": 0,
"item_code": "_Test Item 2",
@ -58,7 +56,6 @@
"has_serial_no": 0,
"income_account": "Sales - _TC",
"inspection_required": 0,
"is_pro_applicable": 0,
"is_stock_item": 1,
"is_sub_contracted_item": 0,
"item_code": "_Test Item Home Desktop 100",
@ -84,7 +81,6 @@
"has_serial_no": 0,
"income_account": "Sales - _TC",
"inspection_required": 0,
"is_pro_applicable": 0,
"is_sub_contracted_item": 0,
"item_code": "_Test Item Home Desktop 200",
"item_group": "_Test Item Group Desktops",
@ -100,7 +96,6 @@
"has_serial_no": 0,
"income_account": "Sales - _TC",
"inspection_required": 0,
"is_pro_applicable": 0,
"is_stock_item": 0,
"is_sub_contracted_item": 0,
"item_code": "_Test Product Bundle Item",
@ -118,7 +113,6 @@
"has_serial_no": 0,
"income_account": "Sales - _TC",
"inspection_required": 0,
"is_pro_applicable": 1,
"is_stock_item": 1,
"is_sub_contracted_item": 1,
"item_code": "_Test FG Item",
@ -132,7 +126,6 @@
"has_batch_no": 0,
"has_serial_no": 0,
"inspection_required": 0,
"is_pro_applicable": 0,
"is_stock_item": 0,
"is_sub_contracted_item": 0,
"item_code": "_Test Non Stock Item",
@ -147,7 +140,6 @@
"has_batch_no": 0,
"has_serial_no": 1,
"inspection_required": 0,
"is_pro_applicable": 0,
"is_stock_item": 1,
"is_sub_contracted_item": 0,
"item_code": "_Test Serialized Item",
@ -162,7 +154,6 @@
"has_batch_no": 0,
"has_serial_no": 1,
"inspection_required": 0,
"is_pro_applicable": 0,
"is_stock_item": 1,
"is_sub_contracted_item": 0,
"item_code": "_Test Serialized Item With Series",
@ -181,7 +172,6 @@
"has_serial_no": 0,
"income_account": "Sales - _TC",
"inspection_required": 0,
"is_pro_applicable": 1,
"is_stock_item": 1,
"is_sub_contracted_item": 0,
"item_code": "_Test Item Home Desktop Manufactured",
@ -199,7 +189,6 @@
"has_serial_no": 0,
"income_account": "Sales - _TC",
"inspection_required": 0,
"is_pro_applicable": 1,
"is_stock_item": 1,
"is_sub_contracted_item": 1,
"item_code": "_Test FG Item 2",
@ -217,7 +206,6 @@
"has_serial_no": 0,
"income_account": "Sales - _TC",
"inspection_required": 0,
"is_pro_applicable": 1,
"is_stock_item": 1,
"is_sub_contracted_item": 1,
"item_code": "_Test Variant Item",