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

Merge pull request #2099 from nabinhait/hotfix

Browse Source 
Minor fixes
This commit is contained in:
Nabin Hait 2014-08-22 15:26:38 +05:30
commit bb29d15d5a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/report/general_ledger/general_ledger.py
View File

@ -136,17 +136,17 @@ def get_accountwise_gle(filters, gl_entries, gle_map):
opening, total_debit, total_credit = 0, 0, 0 opening, total_debit, total_credit = 0, 0, 0
for gle in gl_entries: for gle in gl_entries:
amount = flt(gle.debit) - flt(gle.credit) amount = flt(gle.debit, 3) - flt(gle.credit, 3)
if filters.get("account") and (gle.posting_date<filters.from_date or cstr(gle.is_opening)=="Yes"): if filters.get("account") and (gle.posting_date<filters.from_date or cstr(gle.is_opening)=="Yes"):
gle_map[gle.account].opening += amount gle_map[gle.account].opening += amount
opening += amount opening += amount
elif gle.posting_date <= filters.to_date: elif gle.posting_date <= filters.to_date:
gle_map[gle.account].entries.append(gle) gle_map[gle.account].entries.append(gle)
gle_map[gle.account].total_debit += flt(gle.debit) gle_map[gle.account].total_debit += flt(gle.debit, 3)
gle_map[gle.account].total_credit += flt(gle.credit) gle_map[gle.account].total_credit += flt(gle.credit, 3)
total_debit += flt(gle.debit) total_debit += flt(gle.debit, 3)
total_credit += flt(gle.credit) total_credit += flt(gle.credit, 3)
return opening, total_debit, total_credit, gle_map return opening, total_debit, total_credit, gle_map

4
erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
View File

@ -354,8 +354,8 @@ class ProductionPlanningTool(Document):
def get_projected_qty(self): def get_projected_qty(self):
items = self.item_dict.keys() items = self.item_dict.keys()
item_projected_qty = frappe.db.sql("""select item_code, sum(projected_qty) item_projected_qty = frappe.db.sql("""select item_code, sum(projected_qty)
from `tabBin` where item_code in (%s) group by item_code""" % from `tabBin` where item_code in (%s) and warehouse=%s group by item_code""" %
(", ".join(["%s"]*len(items)),), tuple(items)) (", ".join(["%s"]*len(items)), '%s'), tuple(items + [self.purchase_request_for_warehouse]))
return dict(item_projected_qty) return dict(item_projected_qty)

2
erpnext/selling/doctype/sms_center/sms_center.py
View File

@ -51,7 +51,7 @@ class SMSCenter(Document):
for d in rec: for d in rec:
rec_list += d[0] + ' - ' + d[1] + '\n' rec_list += d[0] + ' - ' + d[1] + '\n'
self.receiver_list = rec_list self.receiver_list = rec_list
def get_receiver_nos(self): def get_receiver_nos(self):
receiver_nos = [] receiver_nos = []