nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
Nabin Hait
2013-02-08 14:07:29 +05:30
parent a76a0687ef df35645e2a
commit 0739e7f573
24 changed files with 230 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
stock/doctype/item/item.py
View File

@@ -220,4 +220,48 @@ class DocType:
if self.doc.slideshow:
from website.helpers.slideshow import get_slideshow
get_slideshow(self)
get_slideshow(self)
test_records = [
[{
"doctype": "Item",
"item_code": "_Test Item Home Desktop 100",
"item_name": "_Test Item Home Desktop 100",
"description": "_Test Item Home Desktop 100",
"item_group": "_Test Item Group Desktops",
"is_stock_item": "Yes",
"is_asset_item": "No",
"has_batch_no": "No",
"has_serial_no": "No",
"is_purchase_item": "Yes",
"is_sales_item": "Yes",
"is_service_item": "No",
"is_sample_item": "No",
"inspection_required": "No",
"is_pro_applicable": "No",
"is_sub_contracted_item": "No",
},
{
"doctype": "Item Tax",
"tax_type": "_Test Account Excise Duty - _TC",
"tax_rate": 10
}],
[{
"doctype": "Item",
"item_code": "_Test Item Home Desktop 200",
"item_name": "_Test Item Home Desktop 200",
"description": "_Test Item Home Desktop 200",
"item_group": "_Test Item Group Desktops",
"is_stock_item": "Yes",
"is_asset_item": "No",
"has_batch_no": "No",
"has_serial_no": "No",
"is_purchase_item": "Yes",
"is_sales_item": "Yes",
"is_service_item": "No",
"is_sample_item": "No",
"inspection_required": "No",
"is_pro_applicable": "No",
"is_sub_contracted_item": "No",
}],
]

15
stock/doctype/warehouse/warehouse.py
View File

@@ -18,7 +18,6 @@ from __future__ import unicode_literals
import webnotes
from webnotes.utils import cstr, flt, validate_email_add
from webnotes.model.doc import Document
from webnotes.model.code import get_obj
from webnotes import msgprint
@@ -204,7 +203,15 @@ class DocType:
# delete cancelled sle
if sql("""select name from `tabStock Ledger Entry`
where warehouse = %s and ifnull('is_cancelled', '') = 'No'""", self.doc.name):
mdgprint("""Warehosue can not be deleted as stock ledger entry
exists for this warehosue.""", raise_exception=1)
msgprint("""Warehosue can not be deleted as stock ledger entry
exists for this warehouse.""", raise_exception=1)
else:
sql("delete from `tabStock Ledger Entry` where warehouse = %s", self.doc.name)
sql("delete from `tabStock Ledger Entry` where warehouse = %s", self.doc.name)
test_records = [
[{
"doctype": "Warehouse",
"warehouse_name": "_Test Warehouse",
"warehouse_type": "_Test Warehouse Type"
}]
]