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

Conflicts:
	accounts/doctype/sales_invoice/test_sales_invoice.py
	buying/doctype/purchase_order/test_purchase_order.py
	stock/doctype/serial_no/serial_no.py
	stock/doctype/stock_entry/stock_entry.py
	stock/doctype/stock_entry/test_stock_entry.py
	stock/doctype/stock_ledger_entry/stock_ledger_entry.py
This commit is contained in:
Anand Doshi
2013-10-15 13:00:49 +05:30
4 changed files with 10 additions and 8 deletions

View File

@@ -103,7 +103,7 @@ class TestPurchaseOrder(unittest.TestCase):
po.doc.company = "_Test Company 1"
po.doc.conversion_rate = 0.0167
self.assertRaises(InvalidWarehouseCompany, po.insert)
def test_uom_integer_validation(self):
from utilities.transaction_base import UOMMustBeIntegerError
po = webnotes.bean(copy=test_records[0])