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

Merge branch 'responsive' of github.com:webnotes/erpnext into responsive

Browse Source 
Conflicts:
	buying/doctype/purchase_order_item/purchase_order_item.txt
This commit is contained in:
Anand Doshi
2013-07-09 13:10:15 +05:30
parent bdee6e074a 0f3d2df8e8
commit c120776931
22 changed files with 126 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,7 +158,7 @@ class TestSalesOrder(unittest.TestCase):
self.check_reserved_qty(so.doclist[1].item_code, so.doclist[1].reserved_warehouse, 10.0)
def test_reserved_qty_for_so_with_packing_list(self):
from stock.doctype.sales_bom.test_sales_bom import test_records as sbom_test_records
from selling.doctype.sales_bom.test_sales_bom import test_records as sbom_test_records
# change item in test so record
test_record = test_records[0][:]
@@ -185,7 +185,7 @@ class TestSalesOrder(unittest.TestCase):
so.doclist[1].reserved_warehouse, 0.0)
def test_reserved_qty_for_partial_delivery_with_packing_list(self):
from stock.doctype.sales_bom.test_sales_bom import test_records as sbom_test_records
from selling.doctype.sales_bom.test_sales_bom import test_records as sbom_test_records
# change item in test so record
@@ -235,7 +235,7 @@ class TestSalesOrder(unittest.TestCase):
so.doclist[1].reserved_warehouse, 20.0)
def test_reserved_qty_for_over_delivery_with_packing_list(self):
from stock.doctype.sales_bom.test_sales_bom import test_records as sbom_test_records
from selling.doctype.sales_bom.test_sales_bom import test_records as sbom_test_records
# change item in test so record
test_record = webnotes.copy_doclist(test_records[0])