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

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

Browse Source
This commit is contained in:
Nabin Hait 2013-11-27 17:31:04 +05:30
commit 752bdbacaf
3 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/report/payment_collection_with_ageing/payment_collection_with_ageing.py
View File

@ -74,4 +74,4 @@ def get_si_posting_date_map():
for t in webnotes.conn.sql("""select name, posting_date from `tabSales Invoice`"""):
si_posting_date_map[t[0]] = t[1]
return si_posting_date_map
return si_posting_date_map

2
accounts/report/payment_made_with_ageing/payment_made_with_ageing.py
View File

@ -73,4 +73,4 @@ def get_pi_posting_date_map():
for t in webnotes.conn.sql("""select name, posting_date from `tabPurchase Invoice`"""):
pi_posting_date_map[t[0]] = t[1]
return pi_posting_date_map
return pi_posting_date_map

39
stock/doctype/serial_no/serial_no.py
View File

@ -128,32 +128,35 @@ class DocType(StockController):
"delivery_date", "delivery_time", "customer", "customer_name",
"warranty_expiry_date"):
self.doc.fields[fieldname] = None
def get_last_sle(self):
entries = {}
sle_dict = self.get_stock_ledger_entries()
if sle_dict.get("incoming", []):
entries["purchase_sle"] = sle_dict["incoming"][0]
for sle in self.get_stock_ledger_entries():
if self.doc.name in get_serial_nos(sle.serial_no):
if not entries.get("last_sle"):
entries["last_sle"] = sle
if not entries.get("purchase_sle") and sle.actual_qty > 0:
entries["purchase_sle"] = sle
elif not entries.get("delivery_sle") and sle.actual_qty < 0 \
and sle.voucher_type in ('Delivery Note', 'Sales Invoice'):
entries["delivery_sle"] = sle
if entries.get("last_sle") and entries.get("purchase_sle") \
and entries.get("delivery_sle"):
break
if len(sle_dict.get("incoming", [])) - len(sle_dict.get("outgoing", [])) > 0:
entries["last_sle"] = sle_dict["incoming"][0]
else:
entries["last_sle"] = sle_dict["outgoing"][0]
entries["delivery_sle"] = sle_dict["outgoing"][0]
return entries
def get_stock_ledger_entries(self):
return webnotes.conn.sql("""select * from `tabStock Ledger Entry`
sle_dict = {}
for sle in webnotes.conn.sql("""select * from `tabStock Ledger Entry`
where serial_no like %s and item_code=%s and ifnull(is_cancelled, 'No')='No'
order by name desc""", ("%%%s%%" % self.doc.name, self.doc.item_code), as_dict=1)
order by posting_date desc, posting_time desc, name desc""",
("%%%s%%" % self.doc.name, self.doc.item_code), as_dict=1):
if self.doc.name in get_serial_nos(sle.serial_no):
if sle.actual_qty > 0:
sle_dict.setdefault("incoming", []).append(sle)
else:
sle_dict.setdefault("outgoing", []).append(sle)
return sle_dict
def on_trash(self):
if self.doc.status == 'Delivered':
webnotes.throw(_("Delivered Serial No ") + self.doc.name + _(" can not be deleted"))