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

[flat discount] fixed test cases for stock entry

Browse Source
This commit is contained in:
Akhilesh Darjee 2013-12-27 14:21:39 +05:30
parent 2b1d8854d5
commit 31ccf9a80b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
accounts/doctype/sales_invoice/pos.js
View File

@ -53,7 +53,8 @@ erpnext.POS = Class.extend({
<div class="flat-discount-area">\ <div class="flat-discount-area">\
<table class="table table-condensed">\ <table class="table table-condensed">\
<tr>\ <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;">\ <td style="text-align: right;">\
<input type="text" class="form-control flat-discount" \ <input type="text" class="form-control flat-discount" \
style="text-align: right;">\ style="text-align: right;">\

1
buying/doctype/purchase_order/test_purchase_order.py
View File

@ -1,7 +1,6 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt # License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
import unittest import unittest
import webnotes import webnotes

2
stock/doctype/stock_entry/stock_entry.py
View File

@ -290,7 +290,7 @@ class DocType(StockController):
if not returnable_qty: if not returnable_qty:
webnotes.throw("{item}: {item_code} {returned}".format( webnotes.throw("{item}: {item_code} {returned}".format(
item=_("Item"), item_code=item.item_code, 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: elif item.transfer_qty > returnable_qty:
webnotes.throw("{item}: {item_code}, {returned}: {qty}".format( webnotes.throw("{item}: {item_code}, {returned}: {qty}".format(
item=_("Item"), item_code=item.item_code, item=_("Item"), item_code=item.item_code,