From 89bd216a0c411588d273669d8b18731e30459221 Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Wed, 26 Jun 2013 18:28:54 +0530 Subject: [PATCH] [Fix] SMS Center --- .../purchase_taxes_and_charges_master.js | 2 +- .../purchase_taxes_and_charges_master.py | 14 +++++++------- .../sales_invoice_item/sales_invoice_item.txt | 7 ++++--- .../supplier_quotation/supplier_quotation.js | 1 - selling/doctype/sms_center/sms_center.py | 7 ++++--- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js index 53588e06295..f04f895baf2 100644 --- a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js +++ b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js @@ -147,7 +147,7 @@ cur_frm.cscript.account_head = function(doc, cdt, cdn) { d.account_head = ''; } else if(d.account_head && d.charge_type) { - arg = "{'charge_type' : '" + d.charge_type +"', 'account_head' : '" + d.account_head + "'}"; + arg = "{'charge_type' : '" + d.charge_type + "', 'account_head' : '" + d.account_head + "'}"; get_server_fields('get_rate', arg, 'purchase_tax_details', doc, cdt, cdn, 1); } refresh_field('account_head',d.name,'purchase_tax_details'); diff --git a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py index 1250db5c283..995415e29a9 100644 --- a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py +++ b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.py @@ -26,11 +26,11 @@ sql = webnotes.conn.sql class DocType: - def __init__(self, doc, doclist=[]): - self.doc = doc - self.doclist = doclist + def __init__(self, doc, doclist=[]): + self.doc = doc + self.doclist = doclist - # Get Tax Rate if account type is Tax - # =================================================================== - def get_rate(self, arg): - return get_obj('Purchase Common').get_rate(arg, self) \ No newline at end of file + # Get Tax Rate if account type is Tax + # =================================================================== + def get_rate(self, arg): + return get_obj('Purchase Common').get_rate(arg, self) \ No newline at end of file diff --git a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt index 89c86f82196..82ad3b15272 100644 --- a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt +++ b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-04-19 11:00:07", + "creation": "2013-06-04 11:02:19", "docstatus": 0, - "modified": "2013-05-22 12:06:15", + "modified": "2013-06-26 14:33:21", "modified_by": "Administrator", "owner": "Administrator" }, @@ -243,7 +243,8 @@ "oldfieldname": "serial_no", "oldfieldtype": "Small Text", "print_hide": 0, - "read_only": 0 + "read_only": 0, + "reqd": 0 }, { "doctype": "DocField", diff --git a/buying/doctype/supplier_quotation/supplier_quotation.js b/buying/doctype/supplier_quotation/supplier_quotation.js index 1e4f6cbfb7d..bac6e9f4efe 100644 --- a/buying/doctype/supplier_quotation/supplier_quotation.js +++ b/buying/doctype/supplier_quotation/supplier_quotation.js @@ -87,7 +87,6 @@ cur_frm.cscript.supplier = function(doc, dt, dn) { get_server_fields('get_default_supplier_address', JSON.stringify({ supplier: doc.supplier }), '', doc, dt, dn, 1, function() { cur_frm.refresh(); }); - cur_frm.cscript.toggle_contact_section(doc); } } diff --git a/selling/doctype/sms_center/sms_center.py b/selling/doctype/sms_center/sms_center.py index 7d50e712326..8b404e6a4d0 100644 --- a/selling/doctype/sms_center/sms_center.py +++ b/selling/doctype/sms_center/sms_center.py @@ -35,11 +35,12 @@ class DocType: def create_receiver_list(self): rec, where_clause = '', '' if self.doc.send_to == 'All Customer Contact': - where_clause = self.doc.customer and " and customer = '%s'" % self.doc.customer or " and ifnull(is_customer, 0) = 1" + where_clause = self.doc.customer and " and customer = '%s'" % self.doc.customer or " and ifnull(customer, '') != ''" if self.doc.send_to == 'All Supplier Contact': - where_clause = self.doc.supplier and " and ifnull(is_supplier, 0) = 1 and supplier = '%s'" % self.doc.supplier or " and ifnull(is_supplier, 0) = 1" + where_clause = self.doc.supplier and " and ifnull(is_supplier, 0) = 1 and supplier = '%s'" % self.doc.supplier or " and ifnull(supplier, '') != ''" if self.doc.send_to == 'All Sales Partner Contact': - where_clause = self.doc.sales_partner and " and ifnull(is_sales_partner, 0) = 1 and sales_aprtner = '%s'" % self.doc.sales_partner or " and ifnull(is_sales_partner, 0) = 1" + where_clause = self.doc.sales_partner and " and ifnull(is_sales_partner, 0) = 1 and sales_partner = '%s'" % self.doc.sales_partner or " and ifnull(sales_partner, '') != ''" + if self.doc.send_to in ['All Contact', 'All Customer Contact', 'All Supplier Contact', 'All Sales Partner Contact']: rec = sql("select CONCAT(ifnull(first_name,''),'',ifnull(last_name,'')), mobile_no from `tabContact` where ifnull(mobile_no,'')!='' and docstatus != 2 %s" % where_clause) elif self.doc.send_to == 'All Lead (Open)':