Merge pull request #32 from nabinhait/3.0.0-hotfix

3.0.0 hotfix

manufacturing/doctype/production_planning_tool/production_planning_tool.py

@@ -135,8 +135,8 @@ def get_items(self):
 			and so_item.parent in (%s) and ifnull(so_item.qty, 0) > ifnull(so_item.delivered_qty, 0)
 			and exists (select * from `tabItem` item where item.name=pi.item_code
 				and (ifnull(item.is_pro_applicable, 'No') = 'Yes'
-					or ifnull(item.is_sub_contracted_item, 'No') = 'Yes'))""" % \
-			(", ".join(["%s"] * len(so_list))), tuple(so_list), as_dict=1)
+					or ifnull(item.is_sub_contracted_item, 'No') = 'Yes')) %s""" % \
+			(", ".join(["%s"] * len(so_list)), item_condition), tuple(so_list), as_dict=1)
 
 		return items + packed_items
 

stock/doctype/stock_reconciliation/stock_reconciliation.py

@@ -106,13 +106,13 @@ def validate_item(self, item_code, row_num):
 
 			# item should not be serialized
 			if item.has_serial_no == "Yes":
-				frappe.throw(_("Serialized item: {0} can not be managed using Stock Reconciliation, \
-					use Stock Entry instead").format(item_code))
+				raise webnotes.ValidationError, (_("Serialized item: {0} can not be managed \
+					using Stock Reconciliation, use Stock Entry instead").format(item_code))
 
 			# item managed batch-wise not allowed
 			if item.has_batch_no == "Yes":
-				frappe.throw(_("Item: {0} managed batch-wise, can not be reconciled using \
-					Stock Reconciliation, instead use Stock Entry").format(item_code))
+				raise webnotes.ValidationError, (_("Item: {0} managed batch-wise, can not be \
+					reconciled using Stock Reconciliation, instead use Stock Entry").format(item_code))
 
 			# docstatus should be < 2
 			validate_cancelled_item(item_code, item.docstatus, verbose=0)