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

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

Browse Source
This commit is contained in:
Rushabh Mehta 2013-01-16 07:48:45 +05:30
commit 9942987c9c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
stock/doctype/stock_reconciliation/stock_reconciliation.py
View File

@ -55,7 +55,14 @@ class DocType(DocListController):
self.validation_messages = [] self.validation_messages = []
item_warehouse_combinations = [] item_warehouse_combinations = []
for row_num, row in enumerate(data[data.index(self.head_row)+1:]):
# validate no of rows
rows = data[data.index(self.head_row)+1:]
if len(rows) > 100:
msgprint(_("""Sorry! We can only allow upto 100 rows for Stock Reconciliation."""),
raise_exception=True)
for row_num, row in enumerate(rows):
# find duplicates # find duplicates
if [row[0], row[1]] in item_warehouse_combinations: if [row[0], row[1]] in item_warehouse_combinations:
self.validation_messages.append(_get_msg(row_num, "Duplicate entry")) self.validation_messages.append(_get_msg(row_num, "Duplicate entry"))
@ -249,8 +256,6 @@ class DocType(DocListController):
""" Delete Stock Ledger Entries related to this Stock Reconciliation """ Delete Stock Ledger Entries related to this Stock Reconciliation
and repost future Stock Ledger Entries""" and repost future Stock Ledger Entries"""
from stock.stock_ledger import update_entries_after
existing_entries = webnotes.conn.sql("""select item_code, warehouse existing_entries = webnotes.conn.sql("""select item_code, warehouse
from `tabStock Ledger Entry` where voucher_type='Stock Reconciliation' from `tabStock Ledger Entry` where voucher_type='Stock Reconciliation'
and voucher_no=%s""", self.doc.name, as_dict=1) and voucher_no=%s""", self.doc.name, as_dict=1)