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

Merge pull request #2089 from neilLasrado/item_group

Browse Source 
Item group
This commit is contained in:
Anand Doshi 2014-08-26 12:56:54 +05:30
commit 5ed2c06eb5
6 changed files with 54 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/doctype/cost_center/test_records.json
View File

@ -15,5 +15,12 @@
"doctype": "Cost Center",
"group_or_ledger": "Ledger",
"parent_cost_center": "_Test Company - _TC"
},
{
"company": "_Test Company",
"cost_center_name": "_Test Cost Center 2",
"doctype": "Cost Center",
"group_or_ledger": "Ledger",
"parent_cost_center": "_Test Company - _TC"
}
]

33
erpnext/setup/doctype/item_group/item_group.json
View File

@ -21,9 +21,10 @@
"search_index": 0
},
{
"fieldname": "cb0",
"fieldtype": "Column Break",
"fieldname": "gs",
"fieldtype": "Section Break",
"in_list_view": 0,
"label": "General Settings",
"permlevel": 0
},
{
@ -55,6 +56,32 @@
"reqd": 1,
"search_index": 0
},
{
"fieldname": "column_break_5",
"fieldtype": "Column Break",
"permlevel": 0
},
{
"fieldname": "default_income_account",
"fieldtype": "Link",
"label": "Default Income Account",
"options": "Account",
"permlevel": 0
},
{
"fieldname": "default_expense_account",
"fieldtype": "Link",
"label": "Default Expense Account",
"options": "Account",
"permlevel": 0
},
{
"fieldname": "default_cost_center",
"fieldtype": "Link",
"label": "Default Cost Center",
"options": "Cost Center",
"permlevel": 0
},
{
"fieldname": "sb9",
"fieldtype": "Section Break",
@ -163,7 +190,7 @@
"in_create": 1,
"issingle": 0,
"max_attachments": 3,
"modified": "2014-08-19 06:42:03.262273",
"modified": "2014-08-20 17:48:34.489750",
"modified_by": "Administrator",
"module": "Setup",
"name": "Item Group",

3
erpnext/setup/doctype/item_group/test_records.json
View File

@ -3,7 +3,8 @@
"doctype": "Item Group",
"is_group": "No",
"item_group_name": "_Test Item Group",
"parent_item_group": "All Item Groups"
"parent_item_group": "All Item Groups",
"default_cost_center": "_Test Cost Center 2 - _TC"
},
{
"doctype": "Item Group",

2
erpnext/stock/doctype/item/test_item.py
View File

@ -27,7 +27,7 @@ class TestItem(unittest.TestCase):
"warehouse": "_Test Warehouse - _TC",
"income_account": "Sales - _TC",
"expense_account": "_Test Account Cost for Goods Sold - _TC",
"cost_center": "_Test Cost Center - _TC",
"cost_center": "_Test Cost Center 2 - _TC",
"qty": 1.0,
"price_list_rate": 100.0,
"base_price_list_rate": 0.0,

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

@ -28,7 +28,6 @@
"warehouse_reorder_qty": 20
}
],
"selling_cost_center": "_Test Cost Center - _TC",
"stock_uom": "_Test UOM",
"show_in_website": 1,
"website_warehouse": "_Test Warehouse - _TC"

20
erpnext/stock/get_item_details.py
View File

@ -35,6 +35,7 @@ def get_item_details(args):
item_doc = frappe.get_doc("Item", args.item_code)
item = item_doc
validate_item_details(args, item)
out = get_basic_details(args, item_doc)
@ -135,16 +136,22 @@ def get_basic_details(args, item_doc):
if len(user_default_warehouse_list)==1 else ""
out = frappe._dict({
"item_code": item.name,
"item_name": item.item_name,
"description": item.description_html or item.description,
"warehouse": user_default_warehouse or args.warehouse or item.default_warehouse,
"income_account": item.income_account or args.income_account \
or frappe.db.get_value("Company", args.company, "default_income_account"),
"expense_account": item.expense_account or args.expense_account \
or frappe.db.get_value("Company", args.company, "default_expense_account"),
"cost_center": item.selling_cost_center \
if args.transaction_type == "selling" else item.buying_cost_center,
"income_account": (item.income_account
or args.income_account
or frappe.db.get_value("Item Group", item.item_group, "default_income_account")
or frappe.db.get_value("Company", args.company, "default_income_account")),
"expense_account": (item.expense_account
or args.expense_account
or frappe.db.get_value("Item Group", item.item_group, "default_expense_account")
or frappe.db.get_value("Company", args.company, "default_expense_account")),
"cost_center": ((item.selling_cost_center if args.transaction_type == "selling" else item.buying_cost_center)
or frappe.db.get_value("Item Group", item.item_group, "default_cost_center")
or frappe.db.get_value("Company", args.company, "cost_center")),
"batch_no": None,
"item_tax_rate": json.dumps(dict(([d.tax_type, d.tax_rate] for d in
item_doc.get("item_tax")))),
@ -174,6 +181,7 @@ def get_price_list_rate(args, item_doc, out):
validate_price_list(args)
validate_conversion_rate(args, meta)
price_list_rate = frappe.db.get_value("Item Price",
{"price_list": args.price_list, "item_code": args.item_code}, "price_list_rate")