From 16fa6472b3b2184db9e8551e19651f32c3b2838a Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 23 Jun 2014 16:42:11 +0530 Subject: [PATCH 1/5] Made warehouse and selling pricing list non-mandatory in pos setting --- erpnext/accounts/doctype/pos_setting/pos_setting.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/pos_setting/pos_setting.json b/erpnext/accounts/doctype/pos_setting/pos_setting.json index 27d79f31df..d0a338c92a 100755 --- a/erpnext/accounts/doctype/pos_setting/pos_setting.json +++ b/erpnext/accounts/doctype/pos_setting/pos_setting.json @@ -62,7 +62,7 @@ "options": "Price List", "permlevel": 0, "read_only": 0, - "reqd": 1 + "reqd": 0 }, { "fieldname": "company", @@ -147,7 +147,7 @@ "options": "Warehouse", "permlevel": 0, "read_only": 0, - "reqd": 1 + "reqd": 0 }, { "fieldname": "cost_center", @@ -205,7 +205,7 @@ ], "icon": "icon-cog", "idx": 1, - "modified": "2014-05-27 03:49:14.735138", + "modified": "2014-06-23 16:40:59.510132", "modified_by": "Administrator", "module": "Accounts", "name": "POS Setting", From 65efd0a9a10fcf393ba3827e6858cccb216ff484 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 23 Jun 2014 18:21:37 +0530 Subject: [PATCH 2/5] sms sending issue fixed --- erpnext/setup/doctype/sms_settings/sms_settings.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/erpnext/setup/doctype/sms_settings/sms_settings.py b/erpnext/setup/doctype/sms_settings/sms_settings.py index a9afacfe30..de1164118e 100644 --- a/erpnext/setup/doctype/sms_settings/sms_settings.py +++ b/erpnext/setup/doctype/sms_settings/sms_settings.py @@ -16,8 +16,7 @@ def validate_receiver_nos(receiver_list): validated_receiver_list = [] for d in receiver_list: # remove invalid character - invalid_char_list = [' ', '+', '-', '(', ')'] - for x in invalid_char_list: + for x in [' ', '+', '-', '(', ')']: d = d.replace(x, '') validated_receiver_list.append(d) @@ -48,6 +47,13 @@ def get_contact_number(contact_name, value, key): @frappe.whitelist() def send_sms(receiver_list, msg, sender_name = ''): + + import json + if isinstance(receiver_list, basestring): + receiver_list = json.loads(receiver_list) + if not isinstance(receiver_list, list): + receiver_list = [receiver_list] + receiver_list = validate_receiver_nos(receiver_list) arg = { From f62b75c731f9aa597a054ff0d2e6986795d3f5d9 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 24 Jun 2014 11:00:13 +0530 Subject: [PATCH 3/5] Fixes in pricing rule --- erpnext/accounts/doctype/pricing_rule/pricing_rule.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py index 967d583aab..2d592d1f96 100644 --- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py @@ -6,6 +6,7 @@ from __future__ import unicode_literals import frappe import json +import copy from frappe import throw, _ from frappe.utils import flt, cint from frappe.model.document import Document @@ -106,8 +107,9 @@ def apply_pricing_rule(args): args.transaction_type = "buying" if frappe.get_meta(args.parenttype).get_field("supplier") \ else "selling" + args_copy = copy.deepcopy(args) + args_copy.pop("item_list") for item in args.get("item_list"): - args_copy = args.copy() args_copy.update(item) out.append(get_pricing_rule_for_item(args_copy)) From efd426650de0db4348aa8e84dc0ac575ecc4e80e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 24 Jun 2014 11:11:08 +0530 Subject: [PATCH 4/5] Fixes in pricing rule --- erpnext/accounts/doctype/pricing_rule/pricing_rule.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py index 2d592d1f96..0474639377 100644 --- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py @@ -107,9 +107,9 @@ def apply_pricing_rule(args): args.transaction_type = "buying" if frappe.get_meta(args.parenttype).get_field("supplier") \ else "selling" - args_copy = copy.deepcopy(args) - args_copy.pop("item_list") for item in args.get("item_list"): + args_copy = copy.deepcopy(args) + args_copy.pop("item_list") args_copy.update(item) out.append(get_pricing_rule_for_item(args_copy)) From 613d784cfb6b92fbdefdd8d5ddea77ce01cf337f Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 24 Jun 2014 12:07:56 +0530 Subject: [PATCH 5/5] Fixes in pricing rule --- erpnext/accounts/doctype/pricing_rule/pricing_rule.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py index 0474639377..2706603bc6 100644 --- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py @@ -107,9 +107,11 @@ def apply_pricing_rule(args): args.transaction_type = "buying" if frappe.get_meta(args.parenttype).get_field("supplier") \ else "selling" - for item in args.get("item_list"): + item_list = args.get("item_list") + args.pop("item_list") + + for item in item_list: args_copy = copy.deepcopy(args) - args_copy.pop("item_list") args_copy.update(item) out.append(get_pricing_rule_for_item(args_copy))