Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive

setup/doctype/company/company.py

@@ -201,8 +201,8 @@ class DocType:
 		
 		for a in accounts:
 			account_name = accounts[a] + " - " + self.doc.abbr
-			if not self.doc.fields[a] and webnotes.conn.exists("Account", account_name):
-				webnotes.conn.set(self.doc, account_name)
+			if not self.doc.fields.get(a) and webnotes.conn.exists("Account", account_name):
+				webnotes.conn.set(self.doc, a, account_name)
 
 		if not self.doc.stock_adjustment_cost_center:
 				webnotes.conn.set(self.doc, "stock_adjustment_cost_center", self.doc.cost_center)

setup/doctype/setup_control/setup_control.py

@@ -61,13 +61,20 @@ class DocType:
 			WHERE name=%(name)s AND docstatus<2""", args)
 	
 	def create_fiscal_year_and_company(self, args):
-		curr_fiscal_year, fy_start_date, fy_abbr = self.get_fy_details(args.get('fy_start'))
-		# Fiscal Year
+		curr_fiscal_year, fy_start_date, fy_abbr = self.get_fy_details(args.get('fy_start'), True)
 		webnotes.bean([{
 			"doctype":"Fiscal Year",
 			'year': curr_fiscal_year,
 			'year_start_date': fy_start_date,
 		}]).insert()
+
+		curr_fiscal_year, fy_start_date, fy_abbr = self.get_fy_details(args.get('fy_start'))
+		webnotes.bean([{
+			"doctype":"Fiscal Year",
+			'year': curr_fiscal_year,
+			'year_start_date': fy_start_date,
+		}]).insert()
+
 		
 		# Company
 		webnotes.bean([{
@@ -198,13 +205,15 @@ class DocType:
 		
 	# Get Fiscal year Details
 	# ------------------------
-	def get_fy_details(self, fy_start):
+	def get_fy_details(self, fy_start, last_year=False):
 		st = {'1st Jan':'01-01','1st Apr':'04-01','1st Jul':'07-01', '1st Oct': '10-01'}
 		curr_year = getdate(nowdate()).year
+		if last_year:
+			curr_year = curr_year - 1
 		if cint(getdate(nowdate()).month) < cint((st[fy_start].split('-'))[0]):
 			curr_year = getdate(nowdate()).year - 1
 		stdt = cstr(curr_year)+'-'+cstr(st[fy_start])
-		#eddt = sql("select DATE_FORMAT(DATE_SUB(DATE_ADD('%s', INTERVAL 1 YEAR), INTERVAL 1 DAY),'%%d-%%m-%%Y')" % (stdt.split('-')[2]+ '-' + stdt.split('-')[1] + '-' + stdt.split('-')[0]))
+
 		if(fy_start == '1st Jan'):
 			fy = cstr(getdate(nowdate()).year)
 			abbr = cstr(fy)[-2:]

setup/page/setup/setup.py

@@ -91,6 +91,19 @@ items = [
 	},
 	{ "doctype": "Sales Taxes and Charges Master" },
 	{ "doctype": "Purchase Taxes and Charges Master" },
+	{
+		"type": "Section",
+		"title": "Opening Accounts and Stock",
+		"icon": "icon-eye-open"
+	},
+	{ "doctype": "Stock Reconciliation" },
+	{ 
+		"doctype": "Journal Voucher",
+		"title": "Opening Accounting Entries",
+		"filter": {
+			"is_opening": "Yes"
+		}
+	},
 	{
 		"type": "Section",
 		"title": "Human Resource",
@@ -148,19 +161,6 @@ items = [
 	{ 
 		"doctype": "Email Digest",
 	},
-	{
-		"type": "Section",
-		"title": "Opening Accounts and Stock",
-		"icon": "icon-eye-open"
-	},
-	{ "doctype": "Stock Reconciliation" },
-	{ 
-		"doctype": "Journal Voucher",
-		"title": "Opening Accounting Entries",
-		"filter": {
-			"is_opening": "Yes"
-		}
-	},
 	{
 		"type": "Section",
 		"title": "Customization",
@@ -244,8 +244,8 @@ def set_count(item):
 	elif "filter" in item:
 		key = item["filter"].keys()[0]
 		item["count"] = webnotes.conn.sql("""select count(*) from `tab%s` where
-			%s = %s""" % (item["doctype"], key, "%s"),
+			%s = %s and docstatus < 2""" % (item["doctype"], key, "%s"),
 			item["filter"][key])[0][0]
 	elif "doctype" in item:
-		item["count"] = webnotes.conn.sql("select count(*) from `tab%s`" \
+		item["count"] = webnotes.conn.sql("select count(*) from `tab%s` where docstatus<2" \
 			% item["doctype"])[0][0]