From 7892d99f3a6340d2159bbf31508e7c903031e3ac Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 18 Dec 2015 10:39:20 +0100 Subject: [PATCH] [FIX] all: references to Odoo 8.0 version In installation script or documentation Fixes #10052 --- README.md | 6 +++--- addons/crm/web_planner_data.xml | 4 ++-- doc/howtos/themes.rst | 2 +- doc/reference/qweb.rst | 2 +- doc/reference/views.rst | 2 +- odoo.py | 10 +++++----- setup/package.py | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index d0528a87c11..95fd20c854b 100644 --- a/README.md +++ b/README.md @@ -16,14 +16,14 @@ a full-featured Open Source ERP when you inst Getting started with Odoo ------------------------- -For a standard installation please follow the Setup instructions +For a standard installation please follow the Setup instructions from the documentation. If you are a developer you may type the following command at your terminal: - wget -O- https://raw.githubusercontent.com/odoo/odoo/master/odoo.py | python + wget -O- https://raw.githubusercontent.com/odoo/odoo/9.0/odoo.py | python -Then follow the developer tutorials +Then follow the developer tutorials For Odoo employees diff --git a/addons/crm/web_planner_data.xml b/addons/crm/web_planner_data.xml index 99d9ead21e2..70804c0cced 100644 --- a/addons/crm/web_planner_data.xml +++ b/addons/crm/web_planner_data.xml @@ -471,7 +471,7 @@ Tip: For developers, you can use our API to load data through scripts: read - the API documentation + the API documentation @@ -528,7 +528,7 @@ diff --git a/doc/howtos/themes.rst b/doc/howtos/themes.rst index cd59db73d5d..49d5126c8e5 100644 --- a/doc/howtos/themes.rst +++ b/doc/howtos/themes.rst @@ -15,7 +15,7 @@ Ready to create your own theme? Great. Here are some things you should know befo .. warning:: - This tutorial requires having installed Odoo v8.0 and the Theme Support Engine (website_less) module. https://www.odoo.com/apps/8.0/website_less/ + This tutorial requires having installed Odoo v9.0 and the Theme Support Engine (website_less) module. https://www.odoo.com/apps/9.0/website_less/ An introduction for web designers diff --git a/doc/reference/qweb.rst b/doc/reference/qweb.rst index 602be2c8b6c..fc4ecd43aca 100644 --- a/doc/reference/qweb.rst +++ b/doc/reference/qweb.rst @@ -610,7 +610,7 @@ API .. [#othertemplates] although it uses a few others, either for historical reasons or because they remain better fits for the - use case. Odoo 8.0 still depends on Jinja_ and Mako_. + use case. Odoo 9.0 still depends on Jinja_ and Mako_. .. _templating: http://en.wikipedia.org/wiki/Template_processor diff --git a/doc/reference/views.rst b/doc/reference/views.rst index 0bf5df327f0..bbc82ffeda1 100644 --- a/doc/reference/views.rst +++ b/doc/reference/views.rst @@ -861,7 +861,7 @@ Possible children of the view element are: according to current user parameters, the latter is the direct value from a :meth:`~openerp.models.Model.read` (except for date and datetime fields that are `formatted according to user's locale - `_) + `_) ``read_only_mode`` self-explanatory diff --git a/odoo.py b/odoo.py index 1791a732f03..6c204e101d6 100755 --- a/odoo.py +++ b/odoo.py @@ -4,7 +4,7 @@ # # To install your odoo development environement type: # -# wget -O- https://raw.githubusercontent.com/odoo/odoo/8.0/odoo.py | python +# wget -O- https://raw.githubusercontent.com/odoo/odoo/9.0/odoo.py | python # # The setup_* subcommands used to boostrap odoo are defined here inline and may # only depends on the python 2.7 stdlib @@ -87,10 +87,10 @@ def cmd_setup_git(): run('git','config','remote.odoo-dev.url','https://github.com/odoo-dev/odoo.git') run('git','config','remote.odoo-dev.pushurl','git@github.com:odoo-dev/odoo.git') run('git','remote','update') - # setup 8.0 branch - run('git','config','branch.8.0.remote','odoo') - run('git','config','branch.8.0.merge','refs/heads/8.0') - run('git','checkout','8.0') + # setup 9.0 branch + run('git','config','branch.9.0.remote','odoo') + run('git','config','branch.9.0.merge','refs/heads/9.0') + run('git','checkout','9.0') else: printf('no git repo found') diff --git a/setup/package.py b/setup/package.py index 586e000ef89..862d54def63 100755 --- a/setup/package.py +++ b/setup/package.py @@ -218,7 +218,7 @@ class KVMWinTestExe(KVM): self.ssh("TEMP=/tmp ./%s /S" % setupfile) self.ssh('PGPASSWORD=openpgpwd /cygdrive/c/"Program Files"/"Odoo %s"/PostgreSQL/bin/createdb.exe -e -U openpg mycompany' % setupversion) self.ssh('/cygdrive/c/"Program Files"/"Odoo %s"/server/openerp-server.exe -d mycompany -i base --stop-after-init' % setupversion) - self.ssh('net start odoo-server-8.0') + self.ssh('net start odoo-server-%s' % version) _rpc_count_modules(port=18069) #----------------------------------------------------------