fixed conflict while merging with master branch

erpnext/setup/doctype/global_defaults/global_defaults.py

@@ -34,6 +34,8 @@ keydict = {
     'valuation_method': 'default_valuation_method',
 	'date_format': 'date_format',
 	'currency_format':'default_currency_format',
+	'account_url':'account_url',
+	'allow_negative_stock' : 'allow_negative_stock'
 }
 
 class DocType:

erpnext/setup/doctype/global_defaults/global_defaults.txt

@@ -224,6 +224,16 @@
 		'fieldtype': u'Select',
 		'label': u'Default Valuation Method',
 		'options': u'FIFO\nMoving Average'
+	},	
+	
+	# DocField
+	{
+		'colour': u'White:FFF',
+		'description': u'Applicable only if valuation method is moving average',
+		'doctype': u'DocField',
+		'fieldname': u'allow_negative_stock',
+		'fieldtype': u'Check',
+		'label': u'Allow Negative Stock'
 	},
 
 	# DocField
@@ -533,4 +543,4 @@
 		'fieldtype': u'Data',
 		'label': u'SMS Sender Name'
 	}
-]
+]