From f4ad37d20868ce21b11e7d10aa91269667a66c9d Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 22 Aug 2014 12:42:57 +0530 Subject: [PATCH 1/3] Reset receiver list always on create receiver list button --- erpnext/selling/doctype/sms_center/sms_center.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/sms_center/sms_center.py b/erpnext/selling/doctype/sms_center/sms_center.py index d53a20ec89..fd3aec5264 100644 --- a/erpnext/selling/doctype/sms_center/sms_center.py +++ b/erpnext/selling/doctype/sms_center/sms_center.py @@ -51,7 +51,7 @@ class SMSCenter(Document): 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 = [] From 00fc600e8ba27d6b26c2e689b23f00214a458420 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 22 Aug 2014 14:06:22 +0530 Subject: [PATCH 2/3] PP Tool: Raise material request based on projected qty in selected warehouse --- .../production_planning_tool/production_planning_tool.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 0d55f8bb5e..a15e3649a1 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 @@ class ProductionPlanningTool(Document): 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) From 40e3d0c7803e7512d14dd5c1dbe8f2a54dc9c8f2 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 22 Aug 2014 14:37:55 +0530 Subject: [PATCH 3/3] General ledger: debit/credit value rounding upto 3 decimals --- .../accounts/report/general_ledger/general_ledger.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index fcacf7ce3d..d1ea4421a5 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -136,17 +136,17 @@ def get_accountwise_gle(filters, gl_entries, gle_map): 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