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

fixes in sales order test cases and set_buying_amount

Browse Source
This commit is contained in:
Nabin Hait 2013-03-12 11:34:56 +05:30
parent f7df8b28d2
commit 0cfbc5feb5
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
selling/doctype/sales_order/test_sales_order.py
View File

@ -65,7 +65,7 @@ class TestSalesOrder(unittest.TestCase):
# submit dn # submit dn
dn = self.create_dn_against_so(so) dn = self.create_dn_against_so(so)
self.check_reserved_qty(so.doclist[1].item_code, so.doclist[1].reserved_warehouse, 6.0) self.check_reserved_qty(so.doclist[1].item_code, so.doclist[1].reserved_warehouse, 5.0)
# stop so # stop so
so.load_from_db() so.load_from_db()
@ -75,7 +75,7 @@ class TestSalesOrder(unittest.TestCase):
# unstop so # unstop so
so.load_from_db() so.load_from_db()
so.obj.unstop_sales_order() so.obj.unstop_sales_order()
self.check_reserved_qty(so.doclist[1].item_code, so.doclist[1].reserved_warehouse, 6.0) self.check_reserved_qty(so.doclist[1].item_code, so.doclist[1].reserved_warehouse, 5.0)
# cancel dn # cancel dn
dn.cancel() dn.cancel()
@ -151,9 +151,9 @@ class TestSalesOrder(unittest.TestCase):
dn = self.create_dn_against_so(so) dn = self.create_dn_against_so(so)
self.check_reserved_qty(sbom_test_records[0][1]["item_code"], self.check_reserved_qty(sbom_test_records[0][1]["item_code"],
so.doclist[1].reserved_warehouse, 30.0) so.doclist[1].reserved_warehouse, 25.0)
self.check_reserved_qty(sbom_test_records[0][2]["item_code"], self.check_reserved_qty(sbom_test_records[0][2]["item_code"],
so.doclist[1].reserved_warehouse, 12.0) so.doclist[1].reserved_warehouse, 10.0)
# stop so # stop so
so.load_from_db() so.load_from_db()
@ -168,9 +168,9 @@ class TestSalesOrder(unittest.TestCase):
so.load_from_db() so.load_from_db()
so.obj.unstop_sales_order() so.obj.unstop_sales_order()
self.check_reserved_qty(sbom_test_records[0][1]["item_code"], self.check_reserved_qty(sbom_test_records[0][1]["item_code"],
so.doclist[1].reserved_warehouse, 30.0) so.doclist[1].reserved_warehouse, 25.0)
self.check_reserved_qty(sbom_test_records[0][2]["item_code"], self.check_reserved_qty(sbom_test_records[0][2]["item_code"],
so.doclist[1].reserved_warehouse, 12.0) so.doclist[1].reserved_warehouse, 10.0)
# cancel dn # cancel dn
dn.cancel() dn.cancel()
@ -234,8 +234,8 @@ test_records = [
"price_list_name": "_Test Price List", "price_list_name": "_Test Price List",
"territory": "_Test Territory", "territory": "_Test Territory",
"transaction_date": "2013-02-21", "transaction_date": "2013-02-21",
"grand_total": 500.0, "grand_total": 1000.0,
"grand_total_export": 500.0, "grand_total_export": 1000.0,
}, },
{ {
"description": "CPU", "description": "CPU",
@ -244,9 +244,9 @@ test_records = [
"item_name": "CPU", "item_name": "CPU",
"parentfield": "sales_order_details", "parentfield": "sales_order_details",
"qty": 10.0, "qty": 10.0,
"basic_rate": 50.0, "basic_rate": 100.0,
"export_rate": 50.0, "export_rate": 100.0,
"amount": 500.0, "amount": 1000.0,
"reserved_warehouse": "_Test Warehouse", "reserved_warehouse": "_Test Warehouse",
} }
], ],

6
stock/utils.py
View File

@ -181,11 +181,13 @@ def get_buying_amount(item_code, warehouse, qty, voucher_type, voucher_no, vouch
def _get_buying_amount(voucher_type, voucher_no, item_row, item_code, warehouse, qty, def _get_buying_amount(voucher_type, voucher_no, item_row, item_code, warehouse, qty,
stock_ledger_entries): stock_ledger_entries):
for i, sle in enumerate(stock_ledger_entries): for i, sle in enumerate(stock_ledger_entries):
if sle.voucher_type == voucher_type and sle.voucher_no == voucher_no: if sle.voucher_type == voucher_type and sle.voucher_no == voucher_no and \
len(stock_ledger_entries) > i+1:
if (sle.voucher_detail_no == item_row) or \ if (sle.voucher_detail_no == item_row) or \
(sle.item_code == item_code and sle.warehouse == warehouse and \ (sle.item_code == item_code and sle.warehouse == warehouse and \
abs(flt(sle.qty)) == qty): abs(flt(sle.qty)) == qty):
buying_amount = flt(stock_ledger_entries[i+1].stock_value) - flt(sle.stock_value) buying_amount = flt(stock_ledger_entries[i+1].stock_value) - \
flt(sle.stock_value)
return buying_amount return buying_amount