nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-26 10:08:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[cleanup] [minor] deprecated cancelled stock ledger entry

Browse Source
This commit is contained in:
Nabin Hait
2013-08-20 12:04:46 +05:30
parent 05652874fc
commit 4ae729bfd2
17 changed files with 22 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
controllers/stock_controller.py
View File

@@ -72,7 +72,6 @@ class StockController(AccountsController):
"incoming_rate": 0,
"company": self.doc.company,
"fiscal_year": self.doc.fiscal_year,
"is_cancelled": self.doc.docstatus==2 and "Yes" or "No",
"batch_no": cstr(d.batch_no).strip(),
"serial_no": d.serial_no,
"project": d.project_name,
@@ -116,8 +115,7 @@ class StockController(AccountsController):
res = webnotes.conn.sql("""select item_code, voucher_type, voucher_no,
voucher_detail_no, posting_date, posting_time, stock_value,
warehouse, actual_qty as qty from `tabStock Ledger Entry`
where ifnull(`is_cancelled`, "No") = "No" and company = %s
and item_code in (%s) and warehouse in (%s)
where company = %s and item_code in (%s) and warehouse in (%s)
order by item_code desc, warehouse desc, posting_date desc,
posting_time desc, name desc""" %
('%s', ', '.join(['%s']*len(item_list)), ', '.join(['%s']*len(warehouse_list))),
@@ -143,6 +141,5 @@ class StockController(AccountsController):
def make_cancel_gl_entries(self):
if webnotes.conn.sql("""select name from `tabGL Entry` where voucher_type=%s
and voucher_no=%s and ifnull(is_cancelled, 'No')='No'""",
(self.doc.doctype, self.doc.name)):
and voucher_no=%s""", (self.doc.doctype, self.doc.name)):
self.make_gl_entries()