nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 19:59:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix in testcases

Browse Source
This commit is contained in:
Nabin Hait
2014-01-23 16:45:22 +05:30
parent 5ae6a61c4d
commit 4ba95d0b7a
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/buying/doctype/purchase_order/test_purchase_order.py
View File

@@ -74,7 +74,7 @@ class TestPurchaseOrder(unittest.TestCase):
self.assertEquals(flt(webnotes.conn.get_value("Bin", {"item_code": "_Test Item", self.assertEquals(flt(webnotes.conn.get_value("Bin", {"item_code": "_Test Item",
"warehouse": "_Test Warehouse - _TC"}, "ordered_qty")), 0.0) "warehouse": "_Test Warehouse - _TC"}, "ordered_qty")), 0.0)
def test_make_purchase_invocie(self): def test_make_purchase_invoice(self):
from erpnext.buying.doctype.purchase_order.purchase_order import make_purchase_invoice from erpnext.buying.doctype.purchase_order.purchase_order import make_purchase_invoice
po = webnotes.bean(copy=test_records[0]).insert() po = webnotes.bean(copy=test_records[0]).insert()

3
erpnext/controllers/accounts_controller.py
View File

@@ -134,7 +134,8 @@ class AccountsController(TransactionBase):
def calculate_taxes_and_totals(self): def calculate_taxes_and_totals(self):
self.discount_amount_applied = False self.discount_amount_applied = False
self._calculate_taxes_and_totals() self._calculate_taxes_and_totals()
if self.meta.get_field(self.doc.doctype, "discount_amount"):
if self.meta.get_field("discount_amount"):
self.apply_discount_amount() self.apply_discount_amount()
def _calculate_taxes_and_totals(self): def _calculate_taxes_and_totals(self):

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

@@ -36,6 +36,7 @@ test_records = [
"stock_uom": "_Test UOM", "stock_uom": "_Test UOM",
"default_income_account": "Sales - _TC", "default_income_account": "Sales - _TC",
"default_warehouse": "_Test Warehouse - _TC", "default_warehouse": "_Test Warehouse - _TC",
"purchase_account": "_Test Account Cost for Goods Sold - _TC"
}, { }, {
"doctype": "Item Reorder", "doctype": "Item Reorder",
"parentfield": "item_reorder", "parentfield": "item_reorder",
@@ -64,6 +65,7 @@ test_records = [
"stock_uom": "_Test UOM", "stock_uom": "_Test UOM",
"default_income_account": "Sales - _TC", "default_income_account": "Sales - _TC",
"default_warehouse": "_Test Warehouse - _TC", "default_warehouse": "_Test Warehouse - _TC",
"purchase_account": "_Test Account Cost for Goods Sold - _TC"
}], }],
[{ [{
"doctype": "Item", "doctype": "Item",
@@ -73,6 +75,7 @@ test_records = [
"item_group": "_Test Item Group Desktops", "item_group": "_Test Item Group Desktops",
"default_warehouse": "_Test Warehouse - _TC", "default_warehouse": "_Test Warehouse - _TC",
"default_income_account": "Sales - _TC", "default_income_account": "Sales - _TC",
"purchase_account": "_Test Account Cost for Goods Sold - _TC",
"is_stock_item": "Yes", "is_stock_item": "Yes",
"is_asset_item": "No", "is_asset_item": "No",
"has_batch_no": "No", "has_batch_no": "No",
@@ -99,6 +102,7 @@ test_records = [
"item_group": "_Test Item Group Desktops", "item_group": "_Test Item Group Desktops",
"default_warehouse": "_Test Warehouse - _TC", "default_warehouse": "_Test Warehouse - _TC",
"default_income_account": "Sales - _TC", "default_income_account": "Sales - _TC",
"purchase_account": "_Test Account Cost for Goods Sold - _TC",
"is_stock_item": "Yes", "is_stock_item": "Yes",
"is_asset_item": "No", "is_asset_item": "No",
"has_batch_no": "No", "has_batch_no": "No",
@@ -119,6 +123,7 @@ test_records = [
"description": "_Test Sales BOM Item", "description": "_Test Sales BOM Item",
"item_group": "_Test Item Group Desktops", "item_group": "_Test Item Group Desktops",
"default_income_account": "Sales - _TC", "default_income_account": "Sales - _TC",
"purchase_account": "_Test Account Cost for Goods Sold - _TC",
"is_stock_item": "No", "is_stock_item": "No",
"is_asset_item": "No", "is_asset_item": "No",
"has_batch_no": "No", "has_batch_no": "No",
@@ -140,6 +145,7 @@ test_records = [
"is_stock_item": "Yes", "is_stock_item": "Yes",
"default_warehouse": "_Test Warehouse - _TC", "default_warehouse": "_Test Warehouse - _TC",
"default_income_account": "Sales - _TC", "default_income_account": "Sales - _TC",
"purchase_account": "_Test Account Cost for Goods Sold - _TC",
"is_asset_item": "No", "is_asset_item": "No",
"has_batch_no": "No", "has_batch_no": "No",
"has_serial_no": "No", "has_serial_no": "No",
@@ -216,6 +222,7 @@ test_records = [
"item_group": "_Test Item Group Desktops", "item_group": "_Test Item Group Desktops",
"default_warehouse": "_Test Warehouse - _TC", "default_warehouse": "_Test Warehouse - _TC",
"default_income_account": "Sales - _TC", "default_income_account": "Sales - _TC",
"purchase_account": "_Test Account Cost for Goods Sold - _TC",
"is_stock_item": "Yes", "is_stock_item": "Yes",
"is_asset_item": "No", "is_asset_item": "No",
"has_batch_no": "No", "has_batch_no": "No",
@@ -238,6 +245,7 @@ test_records = [
"is_stock_item": "Yes", "is_stock_item": "Yes",
"default_warehouse": "_Test Warehouse - _TC", "default_warehouse": "_Test Warehouse - _TC",
"default_income_account": "Sales - _TC", "default_income_account": "Sales - _TC",
"purchase_account": "_Test Account Cost for Goods Sold - _TC",
"is_asset_item": "No", "is_asset_item": "No",
"has_batch_no": "No", "has_batch_no": "No",
"has_serial_no": "No", "has_serial_no": "No",