nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1834 from nabinhait/v4-hotfix

Browse Source 
Multiple fixes
This commit is contained in:
Rushabh Mehta
2014-06-24 12:09:12 +05:30
parent f08881a2b7 613d784cfb
commit 5dfacf2615
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/pos_setting/pos_setting.json
View File

@@ -62,7 +62,7 @@
"options": "Price List", "options": "Price List",
"permlevel": 0, "permlevel": 0,
"read_only": 0, "read_only": 0,
"reqd": 1 "reqd": 0
}, },
{ {
"fieldname": "company", "fieldname": "company",
@@ -147,7 +147,7 @@
"options": "Warehouse", "options": "Warehouse",
"permlevel": 0, "permlevel": 0,
"read_only": 0, "read_only": 0,
"reqd": 1 "reqd": 0
}, },
{ {
"fieldname": "cost_center", "fieldname": "cost_center",
@@ -205,7 +205,7 @@
], ],
"icon": "icon-cog", "icon": "icon-cog",
"idx": 1, "idx": 1,
"modified": "2014-05-27 03:49:14.735138", "modified": "2014-06-23 16:40:59.510132",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "POS Setting", "name": "POS Setting",

8
erpnext/accounts/doctype/pricing_rule/pricing_rule.py
View File

@@ -6,6 +6,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
import json import json
import copy
from frappe import throw, _ from frappe import throw, _
from frappe.utils import flt, cint from frappe.utils import flt, cint
from frappe.model.document import Document from frappe.model.document import Document
@@ -106,8 +107,11 @@ def apply_pricing_rule(args):
args.transaction_type = "buying" if frappe.get_meta(args.parenttype).get_field("supplier") \ args.transaction_type = "buying" if frappe.get_meta(args.parenttype).get_field("supplier") \
else "selling" else "selling"
for item in args.get("item_list"): item_list = args.get("item_list")
args_copy = args.copy() args.pop("item_list")
for item in item_list:
args_copy = copy.deepcopy(args)
args_copy.update(item) args_copy.update(item)
out.append(get_pricing_rule_for_item(args_copy)) out.append(get_pricing_rule_for_item(args_copy))

10
erpnext/setup/doctype/sms_settings/sms_settings.py
View File

@@ -16,8 +16,7 @@ def validate_receiver_nos(receiver_list):
validated_receiver_list = [] validated_receiver_list = []
for d in receiver_list: for d in receiver_list:
# remove invalid character # remove invalid character
invalid_char_list = [' ', '+', '-', '(', ')'] for x in [' ', '+', '-', '(', ')']:
for x in invalid_char_list:
d = d.replace(x, '') d = d.replace(x, '')
validated_receiver_list.append(d) validated_receiver_list.append(d)
@@ -48,6 +47,13 @@ def get_contact_number(contact_name, value, key):
@frappe.whitelist() @frappe.whitelist()
def send_sms(receiver_list, msg, sender_name = ''): 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) receiver_list = validate_receiver_nos(receiver_list)
arg = { arg = {