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

Fixed some Stock Entry test cases

Browse Source
This commit is contained in:
Anand Doshi 2015-03-08 12:42:18 +05:30
parent 1119fb4c00
commit c0eb8c0de3
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/accounts/doctype/account/test_account.py
View File

@ -15,6 +15,7 @@ def _make_test_records(verbose):
["_Test Account Shipping Charges", "_Test Account Stock Expenses", "Ledger", "Chargeable"], ["_Test Account Shipping Charges", "_Test Account Stock Expenses", "Ledger", "Chargeable"],
["_Test Account Customs Duty", "_Test Account Stock Expenses", "Ledger", "Tax"], ["_Test Account Customs Duty", "_Test Account Stock Expenses", "Ledger", "Tax"],
["_Test Account Insurance Charges", "_Test Account Stock Expenses", "Ledger", "Chargeable"], ["_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], ["_Test Account Tax Assets", "Current Assets", "Group", None],

2
erpnext/manufacturing/doctype/workstation/test_workstation.py
View File

@ -4,7 +4,7 @@ from __future__ import unicode_literals
import frappe import frappe
import unittest 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_dependencies = ["Warehouse"]
test_records = frappe.get_test_records('Workstation') test_records = frappe.get_test_records('Workstation')

1
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -301,6 +301,7 @@ class StockEntry(StockController):
operation_cost_per_unit = 0.0 operation_cost_per_unit = 0.0
if self.production_order: if self.production_order:
operation_cost_per_unit = self.get_operation_cost_per_unit(d.bom_no, d.qty) 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.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)) d.amount = flt(flt(d.transfer_qty) * flt(d.incoming_rate), self.precision("transfer_qty", d))
break break

3
erpnext/stock/doctype/stock_entry/test_stock_entry.py
View File

@ -560,6 +560,7 @@ class TestStockEntry(unittest.TestCase):
se.purchase_receipt_no = pr.name se.purchase_receipt_no = pr.name
se.posting_date = "2013-03-01" se.posting_date = "2013-03-01"
se.fiscal_year = "_Test Fiscal Year 2013" 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].qty = se.get("items")[0].transfer_qty = 5
se.get("items")[0].s_warehouse = "_Test Warehouse - _TC" se.get("items")[0].s_warehouse = "_Test Warehouse - _TC"
se.insert() se.insert()
@ -584,6 +585,7 @@ class TestStockEntry(unittest.TestCase):
se = frappe.copy_doc(test_records[0]) se = frappe.copy_doc(test_records[0])
se.purpose = "Purchase Return" se.purpose = "Purchase Return"
se.purchase_receipt_no = pr_docname se.purchase_receipt_no = pr_docname
se.difference_account = "_Test Account Stock Adjustment - _TC"
se.posting_date = "2013-03-01" se.posting_date = "2013-03-01"
se.fiscal_year = "_Test Fiscal Year 2013" se.fiscal_year = "_Test Fiscal Year 2013"
se.get("items")[0].qty = se.get("items")[0].transfer_qty = 6 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 = frappe.copy_doc(test_records[0])
se.purpose = "Purchase Return" se.purpose = "Purchase Return"
se.purchase_receipt_no = pr.name se.purchase_receipt_no = pr.name
se.difference_account = "_Test Account Stock Adjustment - _TC"
se.posting_date = "2013-03-01" se.posting_date = "2013-03-01"
se.fiscal_year = "_Test Fiscal Year 2013" se.fiscal_year = "_Test Fiscal Year 2013"
se.get("items")[0].qty = se.get("items")[0].transfer_qty = 5 se.get("items")[0].qty = se.get("items")[0].transfer_qty = 5