Merge pull request #1828 from rmehta/develop
item query fix
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 0d8eb50..0f11af4 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -263,10 +263,10 @@
for d in self.get('entries'):
item = frappe.db.sql("""select name,is_asset_item,is_sales_item from `tabItem`
where name = %s and (ifnull(end_of_life,'')='' or end_of_life > now())""", d.item_code)
- acc = frappe.db.sql("""select account_type from `tabAccount`
+ acc = frappe.db.sql("""select account_type from `tabAccount`
where name = %s and docstatus != 2""", d.income_account)
- if item and item[0][1] == 'Yes' and not acc[0][0] == 'Fixed Asset':
- msgprint(_("Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item").format(d.item_code), raise_exception=True)
+ if item and item[0][1] == 'Yes' and acc and acc[0][0] != 'Fixed Asset':
+ msgprint(_("Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item").format(acc[0][0], d.item_code), raise_exception=True)
def validate_with_previous_doc(self):
super(SalesInvoice, self).validate_with_previous_doc(self.tname, {
diff --git a/erpnext/selling/doctype/sms_center/sms_center.py b/erpnext/selling/doctype/sms_center/sms_center.py
index 8193954..8c4cad3 100644
--- a/erpnext/selling/doctype/sms_center/sms_center.py
+++ b/erpnext/selling/doctype/sms_center/sms_center.py
@@ -12,7 +12,6 @@
from erpnext.setup.doctype.sms_settings.sms_settings import send_sms
class SMSCenter(Document):
-
def create_receiver_list(self):
rec, where_clause = '', ''
if self.send_to == 'All Customer Contact':
@@ -71,6 +70,7 @@
return receiver_nos
def send_sms(self):
+ receiver_list = []
if not self.message:
msgprint(_("Please enter message before sending"))
else:
diff --git a/erpnext/setup/doctype/naming_series/naming_series.py b/erpnext/setup/doctype/naming_series/naming_series.py
index 100c8ba..cb0d437 100644
--- a/erpnext/setup/doctype/naming_series/naming_series.py
+++ b/erpnext/setup/doctype/naming_series/naming_series.py
@@ -72,7 +72,7 @@
'field_name': 'naming_series',
'property': prop,
'value': prop_dict[prop],
- 'property_type': 'Select',
+ 'property_type': 'Text',
'__islocal': 1
})
ps.save()
diff --git a/erpnext/stock/doctype/serial_no/serial_no.js b/erpnext/stock/doctype/serial_no/serial_no.js
index bb131f3..dce9d45 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.js
+++ b/erpnext/stock/doctype/serial_no/serial_no.js
@@ -17,4 +17,10 @@
frappe.ui.form.on("Serial No", "refresh", function(frm) {
frm.toggle_enable("item_code", frm.doc.__islocal);
+
+ if(frm.doc.status == "Sales Returned" && frm.doc.warehouse)
+ cur_frm.add_custom_button(__('Set Status as Available'), function() {
+ cur_frm.set_value("status", "Available");
+ cur_frm.save();
+ });
});