Merge pull request #2099 from nabinhait/hotfix
Minor fixes
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index fcacf7c..d1ea442 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -136,17 +136,17 @@
opening, total_debit, total_credit = 0, 0, 0
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"):
gle_map[gle.account].opening += amount
opening += amount
elif gle.posting_date <= filters.to_date:
gle_map[gle.account].entries.append(gle)
- gle_map[gle.account].total_debit += flt(gle.debit)
- gle_map[gle.account].total_credit += flt(gle.credit)
+ gle_map[gle.account].total_debit += flt(gle.debit, 3)
+ gle_map[gle.account].total_credit += flt(gle.credit, 3)
- total_debit += flt(gle.debit)
- total_credit += flt(gle.credit)
+ total_debit += flt(gle.debit, 3)
+ total_credit += flt(gle.credit, 3)
return opening, total_debit, total_credit, gle_map
diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
index 0d55f8b..a15e364 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
@@ -354,8 +354,8 @@
def get_projected_qty(self):
items = self.item_dict.keys()
item_projected_qty = frappe.db.sql("""select item_code, sum(projected_qty)
- from `tabBin` where item_code in (%s) group by item_code""" %
- (", ".join(["%s"]*len(items)),), tuple(items))
+ from `tabBin` where item_code in (%s) and warehouse=%s group by item_code""" %
+ (", ".join(["%s"]*len(items)), '%s'), tuple(items + [self.purchase_request_for_warehouse]))
return dict(item_projected_qty)
diff --git a/erpnext/selling/doctype/sms_center/sms_center.py b/erpnext/selling/doctype/sms_center/sms_center.py
index d53a20e..fd3aec5 100644
--- a/erpnext/selling/doctype/sms_center/sms_center.py
+++ b/erpnext/selling/doctype/sms_center/sms_center.py
@@ -51,7 +51,7 @@
for d in rec:
rec_list += d[0] + ' - ' + d[1] + '\n'
- self.receiver_list = rec_list
+ self.receiver_list = rec_list
def get_receiver_nos(self):
receiver_nos = []