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

[fixes] test case for drop shipping and minor fixes for test_reserved_qty_for_partial_delivery & test_reserved_qty_for_partial_delivery_with_packing_list

Browse Source
This commit is contained in:
Saurabh 2015-10-19 17:12:21 +05:30
parent 1a9646739a
commit 99543f72d8
1 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
erpnext/selling/doctype/sales_order/test_sales_order.py
View File

@ -97,7 +97,7 @@ class TestSalesOrder(unittest.TestCase):
# stop so # stop so
so.load_from_db() so.load_from_db()
so.stop_sales_order() so.stop_sales_order("Stopped")
self.assertEqual(get_reserved_qty(), existing_reserved_qty) self.assertEqual(get_reserved_qty(), existing_reserved_qty)
# unstop so # unstop so
@ -147,7 +147,7 @@ class TestSalesOrder(unittest.TestCase):
# stop so # stop so
so.load_from_db() so.load_from_db()
so.stop_sales_order() so.stop_sales_order("Stopped")
self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1) self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1)
self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2) self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2)
@ -296,44 +296,44 @@ class TestSalesOrder(unittest.TestCase):
frappe.db.set_value("Stock Settings", None, "auto_insert_price_list_rate_if_missing", 1) frappe.db.set_value("Stock Settings", None, "auto_insert_price_list_rate_if_missing", 1)
# def test_drop_shipping(self): def test_drop_shipping(self):
# from erpnext.selling.doctype.sales_order.sales_order import make_drop_shipment, make_delivery_note from erpnext.selling.doctype.sales_order.sales_order import make_drop_shipment, make_delivery_note
# from erpnext.stock.doctype.item.test_item import make_item from erpnext.stock.doctype.item.test_item import make_item
#
# po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 0, "is_sales_item": 1, po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 0, "is_sales_item": 1,
# "is_purchase_item": 1, "is_drop_ship": 1, 'default_supplier': '_Test Supplier'}) "is_purchase_item": 1, "is_drop_ship": 1, 'default_supplier': '_Test Supplier'})
#
# dn_item = make_item("_Test Regular Item", {"is_stock_item": 0, "is_sales_item": 1, dn_item = make_item("_Test Regular Item", {"is_stock_item": 0, "is_sales_item": 1,
# "is_purchase_item": 1}) "is_purchase_item": 1})
#
# so_items = [ so_items = [
# { {
# "item_code": po_item.item_code, "item_code": po_item.item_code,
# "warehouse": "_Test Warehouse - _TC", "warehouse": "_Test Warehouse - _TC",
# "qty": 1, "qty": 1,
# "rate": 400, "rate": 400,
# "conversion_factor": 1.0, "conversion_factor": 1.0,
# "is_drop_ship": 1, "is_drop_ship": 1,
# "supplier": '_Test Supplier' "supplier": '_Test Supplier'
# }, },
# { {
# "item_code": dn_item.item_code, "item_code": dn_item.item_code,
# "warehouse": "_Test Warehouse - _TC", "warehouse": "_Test Warehouse - _TC",
# "qty": 1, "qty": 1,
# "rate": 300, "rate": 300,
# "conversion_factor": 1.0 "conversion_factor": 1.0
# } }
# ] ]
#
# so = make_sales_order(items=so_items) so = make_sales_order(item_list=so_items)
# po = make_drop_shipment(so.name, '_Test Supplier') po = make_drop_shipment(so.name, '_Test Supplier')
# dn = make_delivery_note(so.name) dn = make_delivery_note(so.name)
#
# self.assertEquals(so.customer, po.customer) self.assertEquals(so.customer, po.customer)
# self.assertEquals(po.items[0].prevdoc_doctype, "Sales Order") self.assertEquals(po.items[0].prevdoc_doctype, "Sales Order")
# self.assertEquals(po.items[0].prevdoc_docname, so.name) self.assertEquals(po.items[0].prevdoc_docname, so.name)
# self.assertEquals(po.items[0].item_code, po_item.item_code) self.assertEquals(po.items[0].item_code, po_item.item_code)
# self.assertEquals(dn.items[0].item_code, dn.item_code) self.assertEquals(dn.items[0].item_code, dn_item.item_code)
def make_sales_order(**args): def make_sales_order(**args):
so = frappe.new_doc("Sales Order") so = frappe.new_doc("Sales Order")
@ -351,8 +351,9 @@ def make_sales_order(**args):
if "warehouse" not in args: if "warehouse" not in args:
args.warehouse = "_Test Warehouse - _TC" args.warehouse = "_Test Warehouse - _TC"
if args.items: if args.item_list:
so.items = args.items for item in args.item_list:
so.append("items", item)
else: else:
so.append("items", { so.append("items", {