Merge branch 'master' of github.com:webnotes/erpnext

README.md

@@ -14,12 +14,27 @@ ERPNext is built on [wnframework](https://github.com/webnotes/wnframework) (Vers
 
 ## Download and Install
 
+First install all the pre-requisites, then
+
+    $ git clone git://github.com/webnotes/erpnext.git
+    $ cd erpnext
+    $ python erpnext_install.py
+    
 [See installation notes](https://github.com/webnotes/erpnext/wiki/How-to-Install-ERPNext)
 
+## Patch and update
+
+To patch and update from the latest git repository the erpnext folder and run.
+You will have to set your origin in git remote
+
+    $ lib/wnf.py --update origin master
+
 ## Forums
 
-- [User / Functional](http://groups.google.com/group/erpnext-user-forum)
+Please join our forums for more questions:
-- [Technical](http://groups.google.com/group/wnframework)
+
+- [Developer Forum](http://groups.google.com/group/erpnext-developer-forum)
+- [User Forum](http://groups.google.com/group/erpnext-user-forum)
 
 ## License
 

erpnext/startup/startup.css

@@ -12,10 +12,6 @@ span, div, td, input, textarea, button, select {
 	font-family: inherit;
 }
 
-body {
-	color: #616161;
-}
-
 .small {
 	font-size: 11.5px;
 }

public/css/all-app.css

@@ -3844,10 +3844,6 @@ span, div, td, input, textarea, button, select {
 	font-family: inherit;
 }
 
-body {
-	color: #616161;
-}
-
 .small {
 	font-size: 11.5px;
 }

public/css/all-web.css

@@ -2542,10 +2542,6 @@ span, div, td, input, textarea, button, select {
 	font-family: inherit;
 }
 
-body {
-	color: #616161;
-}
-
 .small {
 	font-size: 11.5px;
 }

update_erpnext.py

@@ -1,23 +0,0 @@
-#!/usr/bin/python
-import commands
-
-cmd_list = [
-	'lib/wnf.py --pull origin master',
-	'lib/wnf.py -l',
-	'lib/wnf.py --sync_all'
-]
-err = 0
-for cmd in cmd_list:
-	stat, op = commands.getstatusoutput(cmd)
-	if stat != 0:
-		print "something went wrong"
-		print "cannot proceed with update"
-		print "status: %s" % stat
-		print "output: %s" % op
-		err = 1
-		break
-		
-if not err:
-	print "update_erpnext.py --> run success."
-else:
-	print "update_erpnext.py --> run failed."