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

Merge pull request #1945 from anandpdoshi/anand-july-16

Browse Source 
Fixes in Stock Entry and test cases
This commit is contained in:
Rushabh Mehta 2014-07-16 17:04:18 +05:30
commit 2e21e25613
3 changed files with 305 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/sales_invoice/test_records.json
View File

@ -75,7 +75,7 @@
"customer_name": "_Test Customer", "customer_name": "_Test Customer",
"debit_to": "_Test Customer - _TC", "debit_to": "_Test Customer - _TC",
"doctype": "Sales Invoice", "doctype": "Sales Invoice",
"due_date": "2013-01-23", "due_date": "2013-03-07",
"entries": [ "entries": [
{ {
"amount": 500.0, "amount": 500.0,

1
erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
View File

@ -674,6 +674,7 @@ class TestSalesInvoice(unittest.TestCase):
"notification_email_address": "test@example.com, test1@example.com, test2@example.com", "notification_email_address": "test@example.com, test1@example.com, test2@example.com",
"repeat_on_day_of_month": getdate(today).day, "repeat_on_day_of_month": getdate(today).day,
"posting_date": today, "posting_date": today,
"due_date": None,
"fiscal_year": get_fiscal_year(today)[0], "fiscal_year": get_fiscal_year(today)[0],
"invoice_period_from_date": get_first_day(today), "invoice_period_from_date": get_first_day(today),
"invoice_period_to_date": get_last_day(today) "invoice_period_to_date": get_last_day(today)

5
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -204,7 +204,7 @@ class StockEntry(StockController):
if not self.posting_date or not self.posting_time: if not self.posting_date or not self.posting_time:
frappe.throw(_("Posting date and posting time is mandatory")) frappe.throw(_("Posting date and posting time is mandatory"))
allow_negative_stock = frappe.db.get_value("Stock Settings", None, "allow_negative_stock") allow_negative_stock = cint(frappe.db.get_default("allow_negative_stock"))
for d in self.get('mtn_details'): for d in self.get('mtn_details'):
args = frappe._dict({ args = frappe._dict({
@ -219,7 +219,8 @@ class StockEntry(StockController):
# get actual stock at source warehouse # get actual stock at source warehouse
d.actual_qty = get_previous_sle(args).get("qty_after_transaction") or 0 d.actual_qty = get_previous_sle(args).get("qty_after_transaction") or 0
if d.s_warehouse and not allow_negative_stock and d.actual_qty <= d.transfer_qty: # validate qty during submit
if d.docstatus==1 and d.s_warehouse and not allow_negative_stock and d.actual_qty < d.transfer_qty:
frappe.throw(_("""Row {0}: Qty not avalable in warehouse {1} on {2} {3}. frappe.throw(_("""Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
Available Qty: {4}, Transfer Qty: {5}""").format(d.idx, d.s_warehouse, Available Qty: {4}, Transfer Qty: {5}""").format(d.idx, d.s_warehouse,
self.posting_date, self.posting_time, d.actual_qty, d.transfer_qty)) self.posting_date, self.posting_time, d.actual_qty, d.transfer_qty))