[flat discount] fixed test cases for stock entry
diff --git a/accounts/doctype/sales_invoice/pos.js b/accounts/doctype/sales_invoice/pos.js
index 81f6ae9..9e11fa8 100644
--- a/accounts/doctype/sales_invoice/pos.js
+++ b/accounts/doctype/sales_invoice/pos.js
@@ -53,7 +53,8 @@
<div class="flat-discount-area">\
<table class="table table-condensed">\
<tr>\
- <td style="vertical-align: middle;"><b>Flat Discount</b></td>\
+ <td style="vertical-align: middle;" width="50%"><b>Flat Discount</b></td>\
+ <td width="20%"></td>\
<td style="text-align: right;">\
<input type="text" class="form-control flat-discount" \
style="text-align: right;">\
diff --git a/buying/doctype/purchase_order/test_purchase_order.py b/buying/doctype/purchase_order/test_purchase_order.py
index f6c435c..23d5ea4 100644
--- a/buying/doctype/purchase_order/test_purchase_order.py
+++ b/buying/doctype/purchase_order/test_purchase_order.py
@@ -1,7 +1,6 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
-
from __future__ import unicode_literals
import unittest
import webnotes
diff --git a/stock/doctype/stock_entry/stock_entry.py b/stock/doctype/stock_entry/stock_entry.py
index 2e7e2a4..8eddbd4 100644
--- a/stock/doctype/stock_entry/stock_entry.py
+++ b/stock/doctype/stock_entry/stock_entry.py
@@ -290,7 +290,7 @@
if not returnable_qty:
webnotes.throw("{item}: {item_code} {returned}".format(
item=_("Item"), item_code=item.item_code,
- returned=_("already returned though some other documents")))
+ returned=_("already returned though some other documents")), StockOverReturnError)
elif item.transfer_qty > returnable_qty:
webnotes.throw("{item}: {item_code}, {returned}: {qty}".format(
item=_("Item"), item_code=item.item_code,