Merge pull request #2843 from anandpdoshi/anand-feb-24

[fix] Added unicode_literals if missing in py files

erpnext/__version__.py

@@ -1 +1,2 @@
+from __future__ import unicode_literals
 __version__ = '4.22.1'

erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py

@@ -1,6 +1,7 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
+from __future__ import unicode_literals
 
 import frappe
-test_records = frappe.get_test_records('Budget Distribution')
+test_records = frappe.get_test_records('Budget Distribution')

erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 account_properties = {
 	"Deutscher Kontenplan SKR03": {
 		"Bilanzkonten": {

erpnext/accounts/doctype/cost_center/test_cost_center.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/accounts/doctype/pos_setting/test_pos_setting.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest, json, copy

erpnext/accounts/doctype/sales_taxes_and_charges_master/test_sales_taxes_and_charges_master.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/buying/doctype/supplier/test_supplier.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/config/accounts.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 
 def get_data():

erpnext/config/buying.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 
 def get_data():

erpnext/config/desktop.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 
 def get_data():

erpnext/config/hr.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 
 def get_data():

erpnext/config/manufacturing.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 
 def get_data():

erpnext/config/projects.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 
 def get_data():

erpnext/config/selling.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 
 def get_data():

erpnext/config/setup.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 from frappe.widgets.moduleview import add_setup_section
 

erpnext/config/stock.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 
 def get_data():

erpnext/config/support.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from frappe import _
 
 def get_data():

erpnext/controllers/tests/test_recurring_document.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import frappe.permissions

erpnext/hooks.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 app_name = "erpnext"
 app_title = "ERPNext"
 app_publisher = "Web Notes Technologies Pvt. Ltd. and Contributors"

erpnext/hr/doctype/attendance/test_attendance.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/hr/doctype/branch/test_branch.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/hr/doctype/deduction_type/test_deduction_type.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/hr/doctype/department/test_department.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 test_ignore = ["Leave Block List"]
 

erpnext/hr/doctype/designation/test_designation.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/hr/doctype/earning_type/test_earning_type.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/hr/doctype/employee/test_employee.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/hr/doctype/employment_type/test_employment_type.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/hr/doctype/expense_claim/test_expense_claim.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/hr/doctype/holiday_list/test_holiday_list.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/hr/doctype/leave_allocation/test_leave_allocation.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 test_records = frappe.get_test_records('Leave Allocation')

erpnext/hr/doctype/leave_application/test_leave_application.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/hr/doctype/leave_block_list/test_leave_block_list.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/hr/doctype/leave_type/test_leave_type.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/hr/doctype/salary_slip/test_salary_slip.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import unittest
 import frappe

erpnext/hr/doctype/salary_structure/test_salary_structure.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/manufacturing/doctype/bom/bom.py

@@ -395,30 +395,23 @@ def get_bom_items_as_dict(bom, qty=1, fetch_exploded=1):
 				item.expense_account as expense_account,
 				item.buying_cost_center as cost_center
 			from
-				`tab%(table)s` bom_item, `tabBOM` bom, `tabItem` item
+				`tab{table}` bom_item, `tabBOM` bom, `tabItem` item
 			where
 				bom_item.parent = bom.name
 				and bom_item.docstatus < 2
-				and bom_item.parent = "%(bom)s"
+				and bom_item.parent = %(bom)s
 				and item.name = bom_item.item_code
-				%(conditions)s
+				{conditions}
 				group by item_code, stock_uom"""
 
 	if fetch_exploded:
-		items = frappe.db.sql(query % {
+		query = query.format(table="BOM Explosion Item",
-			"qty": qty,
+			conditions="""and ifnull(item.is_pro_applicable, 'No') = 'No'
-			"table": "BOM Explosion Item",
+				and ifnull(item.is_sub_contracted_item, 'No') = 'No' """)
-			"bom": bom,
+		items = frappe.db.sql(query, { "qty": qty,	"bom": bom }, as_dict=True)
-			"conditions": """and ifnull(item.is_pro_applicable, 'No') = 'No'
-					and ifnull(item.is_sub_contracted_item, 'No') = 'No' """
-		}, as_dict=True)
 	else:
-		items = frappe.db.sql(query % {
+		query = query.format(table="BOM Item", conditions="")
-			"qty": qty,
+		items = frappe.db.sql(query, { "qty": qty, "bom": bom }, as_dict=True)
-			"table": "BOM Item",
-			"bom": bom,
-			"conditions": ""
-		}, as_dict=True)
 
 	# make unique
 	for item in items:

erpnext/manufacturing/doctype/workstation/test_workstation.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/patches/v4_0/fix_contact_address.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 def execute():

erpnext/patches/v4_0/new_address_template.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 def execute():

erpnext/patches/v4_0/rename_sitemap_to_route.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 import frappe.model
 

erpnext/patches/v4_2/default_website_style.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 from frappe.templates.pages.style_settings import default_properties
 

erpnext/patches/v4_2/update_project_milestones.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 def execute():

erpnext/patches/v4_2/update_sales_order_invoice_field_name.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 def execute():

erpnext/projects/doctype/activity_type/test_activity_type.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/projects/doctype/project/test_project.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/projects/doctype/task/test_task.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/projects/doctype/time_log/test_time_log.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/projects/doctype/time_log_batch/test_time_log_batch.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe, unittest
 

erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 from frappe import _

erpnext/selling/doctype/campaign/test_campaign.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/selling/doctype/industry_type/test_industry_type.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/selling/doctype/opportunity/test_opportunity.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/selling/doctype/quotation/test_quotation.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe, json
 from frappe.utils import flt

erpnext/selling/doctype/sales_bom/test_sales_bom.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/selling/doctype/sales_order/test_sales_order.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 from frappe.utils import flt

erpnext/setup/doctype/brand/test_brand.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/setup/doctype/company/test_company.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 test_ignore = ["Account", "Cost Center"]
 

erpnext/setup/doctype/country/test_country.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/setup/doctype/currency/test_currency.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 # pre loaded
 

erpnext/setup/doctype/currency_exchange/test_currency_exchange.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/setup/doctype/customer_group/test_customer_group.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 test_ignore = ["Price List"]
 

erpnext/setup/doctype/print_heading/test_print_heading.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/setup/doctype/quotation_lost_reason/test_quotation_lost_reason.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/setup/doctype/sales_partner/test_sales_partner.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/setup/doctype/sales_person/test_sales_person.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 test_dependencies = ["Employee"]
 

erpnext/setup/doctype/supplier_type/test_supplier_type.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/setup/doctype/terms_and_conditions/test_terms_and_conditions.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/setup/doctype/territory/test_territory.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/setup/doctype/uom/test_uom.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/stock/doctype/batch/test_batch.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 from frappe.exceptions import ValidationError

erpnext/stock/doctype/warehouse/test_warehouse.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe
 from frappe import _

erpnext/stock/utils.py

@@ -1,6 +1,7 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
+from __future__ import unicode_literals
 import frappe
 from frappe import _
 import json

erpnext/support/doctype/newsletter/test_newsletter.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 import frappe, unittest
 

erpnext/support/doctype/support_ticket/test_support_ticket.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest

erpnext/utilities/doctype/contact/test_contact.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
 
 import frappe

erpnext/utilities/doctype/note/test_note.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import frappe
 import unittest