From 31ccf9a80bd7fa61e3debe40904995995cd370c0 Mon Sep 17 00:00:00 2001
From: Akhilesh Darjee <akhileshdarjee@gmail.com>
Date: Fri, 27 Dec 2013 14:21:39 +0530
Subject: [PATCH] [flat discount] fixed test cases for stock entry

---
 accounts/doctype/sales_invoice/pos.js                | 3 ++-
 buying/doctype/purchase_order/test_purchase_order.py | 1 -
 stock/doctype/stock_entry/stock_entry.py             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/accounts/doctype/sales_invoice/pos.js b/accounts/doctype/sales_invoice/pos.js
index 81f6ae9124..9e11fa80d2 100644
--- a/accounts/doctype/sales_invoice/pos.js
+++ b/accounts/doctype/sales_invoice/pos.js
@@ -53,7 +53,8 @@ erpnext.POS = Class.extend({
 							<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 f6c435c6fb..23d5ea4dca 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 2e7e2a4066..8eddbd4560 100644
--- a/stock/doctype/stock_entry/stock_entry.py
+++ b/stock/doctype/stock_entry/stock_entry.py
@@ -290,7 +290,7 @@ class DocType(StockController):
 				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,