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

Conflicts:
	stock/doctype/material_request/material_request.txt

setup/doctype/company/company.py

@@ -191,6 +191,8 @@ class DocType:
 
 	def set_default_accounts(self):
 		accounts = {
+			"default_income_account": "Sales",
+			"default_expense_account": "Cost of Goods Sold",
 			"receivables_group": "Accounts Receivable",
 			"payables_group": "Accounts Payable",
 			"stock_received_but_not_billed": "Stock Received But Not Billed",

setup/doctype/company/company.txt

@@ -2,7 +2,7 @@
  {
   "creation": "2013-04-10 08:35:39", 
   "docstatus": 0, 
-  "modified": "2013-07-05 14:32:14", 
+  "modified": "2013-07-08 17:34:21", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -89,15 +89,6 @@
   "oldfieldtype": "Section Break", 
   "read_only": 0
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "default_currency", 
-  "fieldtype": "Link", 
-  "label": "Default Currency", 
-  "options": "Currency", 
-  "read_only": 0, 
-  "reqd": 1
- }, 
  {
   "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
@@ -142,6 +133,28 @@
   "options": "Account", 
   "read_only": 0
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "default_expense_account", 
+  "fieldtype": "Link", 
+  "label": "Default Expense Account", 
+  "options": "Account"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "default_income_account", 
+  "fieldtype": "Link", 
+  "label": "Default Income Account", 
+  "options": "Account"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "column_break0", 
+  "fieldtype": "Column Break", 
+  "oldfieldtype": "Column Break", 
+  "read_only": 0, 
+  "width": "50%"
+ }, 
  {
   "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
@@ -153,11 +166,12 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "column_break0", 
-  "fieldtype": "Column Break", 
-  "oldfieldtype": "Column Break", 
+  "fieldname": "default_currency", 
+  "fieldtype": "Link", 
+  "label": "Default Currency", 
+  "options": "Currency", 
   "read_only": 0, 
-  "width": "50%"
+  "reqd": 1
  }, 
  {
   "depends_on": "eval:!doc.__islocal",