From 4b4b452cad279004bb22a9dde9d1b2d9e16a0879 Mon Sep 17 00:00:00 2001 From: odony Date: Fri, 16 May 2014 13:31:48 +0200 Subject: [PATCH] Update README.md [IMP] Move migration instructions on top, remove cruft --- README.md | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 049ee563648..552831c63c7 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,40 @@ About Odoo ========== -Odoo is suite of OpenSource Business apps. More info at http://www.odoo.com +Odoo is suite of open source Business apps. More info at http://www.odoo.com Installation ============ [Setup/migration guide for employees](https://github.com/odoo/odoo/blob/master/doc/git.rst) + +Migration from bazaar +===================== + +If you have existing bazaar branches and want to move them to a git repository, +there are several options: + +* download http://nightly.openerp.com/move-branch.zip and run it with + `python move-branch.zip -h` (for the help). It should be able to convert + simple-enough branches for you (even if they have merge commits &al) +* Extract the branch contents as patches and use `git apply` or `git am` to + rebuild a branch from them +* Replay the branch by hand + + System Requirements ------------------- The dependencies are listed in setup.py -For Luxembourg localization, you also need -[pdftk](http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/) Debian/Ubuntu ------------- Add the the apt repository - deb http://nightly.openerp.com/6.1/deb/ ./ + deb http://nightly.openerp.com/7.0/deb/ ./ in your source.list and type: @@ -51,21 +64,10 @@ Windows Check the notes in setup.py + Setting up your database ------------------------ Point your browser to http://localhost:8069/ and click "Manage Databases", the default master password is "admin". -Migration from bazaar -===================== - -If you have existing bazaar branches and want to move them to a git repository, -there are several options: - -* download http://nightly.openerp.com/move-branch.zip and run it with - `python move-branch.zip -h` (for the help). It should be able to convert - simple-enough branches for you (even if they have merge commits &al) -* Extract the branch contents as patches and use `git apply` or `git am` to - rebuild a branch from them -* Replay the branch by hand