nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 20:29:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive

Browse Source
This commit is contained in:
Nabin Hait
2013-07-04 17:56:51 +05:30
parent 151b0bd153 be2016ba41
commit bc9cf1549f
8 changed files with 103 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stock/doctype/item/item.js
View File

@@ -40,7 +40,7 @@ cur_frm.cscript.refresh = function(doc) {
cur_frm.cscript.make_dashboard = function() {
cur_frm.dashboard.reset();
if(doc.__islocal)
if(cur_frm.doc.__islocal)
return;
}

7
stock/doctype/item/test_item.py
View File

@@ -62,7 +62,8 @@ test_records = [
"is_pro_applicable": "No",
"is_sub_contracted_item": "No",
"stock_uom": "_Test UOM",
"default_warehouse": "_Test Warehouse"
"default_income_account": "Sales - _TC",
"default_warehouse": "_Test Warehouse",
}, {
"doctype": "Item Reorder",
"parentfield": "item_reorder",
@@ -85,6 +86,7 @@ test_records = [
"description": "_Test Item Home Desktop 100",
"item_group": "_Test Item Group Desktops",
"default_warehouse": "_Test Warehouse",
"default_income_account": "Sales - _TC",
"is_stock_item": "Yes",
"is_asset_item": "No",
"has_batch_no": "No",
@@ -110,6 +112,7 @@ test_records = [
"description": "_Test Item Home Desktop 200",
"item_group": "_Test Item Group Desktops",
"default_warehouse": "_Test Warehouse",
"default_income_account": "Sales - _TC",
"is_stock_item": "Yes",
"is_asset_item": "No",
"has_batch_no": "No",
@@ -129,6 +132,7 @@ test_records = [
"item_name": "_Test Sales BOM Item",
"description": "_Test Sales BOM Item",
"item_group": "_Test Item Group Desktops",
"default_income_account": "Sales - _TC",
"is_stock_item": "No",
"is_asset_item": "No",
"has_batch_no": "No",
@@ -150,6 +154,7 @@ test_records = [
"item_group": "_Test Item Group Desktops",
"is_stock_item": "Yes",
"default_warehouse": "_Test Warehouse",
"default_income_account": "Sales - _TC",
"is_asset_item": "No",
"has_batch_no": "No",
"has_serial_no": "No",