From abe69afd6990b2c5267daa55b1b51706a1021806 Mon Sep 17 00:00:00 2001 From: Dale Scott Date: Sun, 11 Jan 2015 10:38:03 -0700 Subject: [PATCH 1/3] corrections and clarifications mostly current websites for user guide, forum, ... --- README.md | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index b9d5a6e5f77..2d1fe701de4 100644 --- a/README.md +++ b/README.md @@ -2,33 +2,30 @@ [https://erpnext.com](https://erpnext.com) -Includes Accounting, Inventory, CRM, Sales, Purchase, Projects, HRMS. Built on Python / MariaDB. +Includes Accounting, Inventory, CRM, Sales, Purchase, Projects, HRMS. Python back-end with Javascript client in browser. Requires MariaDB. -ERPNext is built on [frappe](https://github.com/frappe/frappe) Python Framework. +ERPNext is built on the [Frappe](https://github.com/frappe/frappe) Framework, a full-stack web framework in python & js. -- [User Guide](http://erpnext.org/user-guide.html) +- [User Guide](https://erpnext.com/user-guide) - [Getting Help](http://erpnext.org/getting-help.html) -- [Developer Forum](http://groups.google.com/group/erpnext-developer-forum) -- [User Forum](http://groups.google.com/group/erpnext-user-forum) +- [Discussion Forum](https://discuss.frappe.io/) --- -### Install +### Full Install -Use the bench, https://github.com/frappe/bench +Follow the Easy Way install script for bench, see https://github.com/frappe/bench -### Admin Login +The install script will create new passwords for the ERPNext "Administrator user, MariaDB root user, and frappe user (passwords are both displayed and saved to file ~/frappe_passwords.txt). -1. go to "/login" -1. Administrator user name: "Administrator" -1. Administrator password: "admin" +### Virtual Image -### Download and Install - -##### Virtual Image: +You can download a virtual image to run ERPNext in a virtual machine on your local system. - [ERPNext Download](http://erpnext.com/download) +System and user credentials are listed on the download page. + --- ## License From 354892b1c68fcc34a5255412f5e51ae14ca4d8bf Mon Sep 17 00:00:00 2001 From: Dale Scott Date: Sun, 11 Jan 2015 11:01:01 -0700 Subject: [PATCH 2/3] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2d1fe701de4..1ad0d0c8591 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# ERPNext - Open Source ERP for small, medium sized businesses [![Build Status](https://travis-ci.org/frappe/erpnext.png)](https://travis-ci.org/frappe/erpnext) +# ERPNext - Open source ERP for small and medium-size business [![Build Status](https://travis-ci.org/frappe/erpnext.png)](https://travis-ci.org/frappe/erpnext) -[https://erpnext.com](https://erpnext.com) +Website: [https://erpnext.com](https://erpnext.com) -Includes Accounting, Inventory, CRM, Sales, Purchase, Projects, HRMS. Python back-end with Javascript client in browser. Requires MariaDB. +Includes: Accounting, Inventory, CRM, Sales, Purchase, Projects, HRMS. Python back-end with Javascript client in browser. Requires MariaDB. ERPNext is built on the [Frappe](https://github.com/frappe/frappe) Framework, a full-stack web framework in python & js. From ab2e75e98e05001b98fa4bfb90b6da8e9cc0437c Mon Sep 17 00:00:00 2001 From: Dale Scott Date: Sun, 11 Jan 2015 11:04:43 -0700 Subject: [PATCH 3/3] Update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1ad0d0c8591..efa3e330692 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # ERPNext - Open source ERP for small and medium-size business [![Build Status](https://travis-ci.org/frappe/erpnext.png)](https://travis-ci.org/frappe/erpnext) -Website: [https://erpnext.com](https://erpnext.com) +[https://erpnext.com](https://erpnext.com) -Includes: Accounting, Inventory, CRM, Sales, Purchase, Projects, HRMS. Python back-end with Javascript client in browser. Requires MariaDB. +Includes: Accounting, Inventory, CRM, Sales, Purchase, Projects, HRMS. Requires MariaDB. -ERPNext is built on the [Frappe](https://github.com/frappe/frappe) Framework, a full-stack web framework in python & js. +ERPNext is built on the [Frappe](https://github.com/frappe/frappe) Framework, a full-stack web app framework in Python & Javascript. - [User Guide](https://erpnext.com/user-guide) - [Getting Help](http://erpnext.org/getting-help.html) @@ -14,9 +14,9 @@ ERPNext is built on the [Frappe](https://github.com/frappe/frappe) Framework, a ### Full Install -Follow the Easy Way install script for bench, see https://github.com/frappe/bench +The Easy Way install script for bench will install all dependencies (e.g. MariaDB). See https://github.com/frappe/bench -The install script will create new passwords for the ERPNext "Administrator user, MariaDB root user, and frappe user (passwords are both displayed and saved to file ~/frappe_passwords.txt). +New passwords will be created for the ERPNext "Administrator" user, the MariaDB root user, and the frappe user (the script displays the passwords and saves them to ~/frappe_passwords.txt). ### Virtual Image