From c0eb8c0de388d8ad7d2aa1702576213a19f33a7a Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Sun, 8 Mar 2015 12:42:18 +0530 Subject: [PATCH] Fixed some Stock Entry test cases --- erpnext/accounts/doctype/account/test_account.py | 1 + erpnext/manufacturing/doctype/workstation/test_workstation.py | 2 +- erpnext/stock/doctype/stock_entry/stock_entry.py | 1 + erpnext/stock/doctype/stock_entry/test_stock_entry.py | 3 +++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/account/test_account.py b/erpnext/accounts/doctype/account/test_account.py index 5c9b5b6c2ba..985b884ed39 100644 --- a/erpnext/accounts/doctype/account/test_account.py +++ b/erpnext/accounts/doctype/account/test_account.py @@ -15,6 +15,7 @@ def _make_test_records(verbose): ["_Test Account Shipping Charges", "_Test Account Stock Expenses", "Ledger", "Chargeable"], ["_Test Account Customs Duty", "_Test Account Stock Expenses", "Ledger", "Tax"], ["_Test Account Insurance Charges", "_Test Account Stock Expenses", "Ledger", "Chargeable"], + ["_Test Account Stock Adjustment", "_Test Account Stock Expenses", "Ledger", "Stock Adjustment"], ["_Test Account Tax Assets", "Current Assets", "Group", None], diff --git a/erpnext/manufacturing/doctype/workstation/test_workstation.py b/erpnext/manufacturing/doctype/workstation/test_workstation.py index d73332ddba7..21692608548 100644 --- a/erpnext/manufacturing/doctype/workstation/test_workstation.py +++ b/erpnext/manufacturing/doctype/workstation/test_workstation.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import frappe import unittest -from .workstation import check_if_within_operating_hours, NotInWorkingHoursError, WorkstationHolidayError +from erpnext.manufacturing.doctype.workstation.workstation import check_if_within_operating_hours, NotInWorkingHoursError, WorkstationHolidayError test_dependencies = ["Warehouse"] test_records = frappe.get_test_records('Workstation') diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index e41f39e5972..6c398f70d27 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -301,6 +301,7 @@ class StockEntry(StockController): operation_cost_per_unit = 0.0 if self.production_order: operation_cost_per_unit = self.get_operation_cost_per_unit(d.bom_no, d.qty) + d.incoming_rate = operation_cost_per_unit + (raw_material_cost / flt(d.transfer_qty)) d.amount = flt(flt(d.transfer_qty) * flt(d.incoming_rate), self.precision("transfer_qty", d)) break diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index 4d6bb8f264b..21b38dc97df 100644 --- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py @@ -560,6 +560,7 @@ class TestStockEntry(unittest.TestCase): se.purchase_receipt_no = pr.name se.posting_date = "2013-03-01" se.fiscal_year = "_Test Fiscal Year 2013" + se.difference_account = "_Test Account Stock Adjustment - _TC" se.get("items")[0].qty = se.get("items")[0].transfer_qty = 5 se.get("items")[0].s_warehouse = "_Test Warehouse - _TC" se.insert() @@ -584,6 +585,7 @@ class TestStockEntry(unittest.TestCase): se = frappe.copy_doc(test_records[0]) se.purpose = "Purchase Return" se.purchase_receipt_no = pr_docname + se.difference_account = "_Test Account Stock Adjustment - _TC" se.posting_date = "2013-03-01" se.fiscal_year = "_Test Fiscal Year 2013" se.get("items")[0].qty = se.get("items")[0].transfer_qty = 6 @@ -661,6 +663,7 @@ class TestStockEntry(unittest.TestCase): se = frappe.copy_doc(test_records[0]) se.purpose = "Purchase Return" se.purchase_receipt_no = pr.name + se.difference_account = "_Test Account Stock Adjustment - _TC" se.posting_date = "2013-03-01" se.fiscal_year = "_Test Fiscal Year 2013" se.get("items")[0].qty = se.get("items")[0].transfer_qty = 5