[IMP] Change string 'brand' by 'make' in fleet module
[MERGE][IMP] fleet: wording (US English)

Merge remote-tracking branch 'odoo-dev/master-fleet-rename-field-ypa'

Closes #1176
[IMP] sale: small view changes in quotation

Closes #1259
[IMP] tests cases: use float_compare instead of ==
Update stock.rst

Fix typo in table
[IMP] Improved Question Advices in website_forum
Merge pull request #1306 from gde-odoo/patch-1

Update stock.rst
[IMP] point_of_sale: add product variants in reporting

Closes #1322
[FIX] tour.js: wait must be used for the current step instead of the previous step. Remove setimeout delay for activate the element.
Merge pull request #1336 from odoo-dev/master-fix-tour-wait-chm

[FIX] tour.js: wait must be used for the current step instead of the previous step. Remove setimeout delay for activate the element.
[IMP] proj: optionalize default alias generation
[FIX] contact widget should return a really empty address

This fixes a bug in website_quote, because qweb tests whether address is
something that bool() casts to False or not, in order to display an icon (or not).
[FIX] Temporary disable addons subcommand auto discovery

The problem with the current approach is that it imports all modules in
order to discover which one exposes a subcommand by subclassing
openerp.cli.Command. At that time, the arguments are not parsed in order
to setup the config because a subcommand could potentialy alter the
command line arguments (which is the case of `start`)

This behavior causes the modules to be imported with the default config and all
the modules using some config keys at startup won't have to value they
are supposed to have when considering the shared command line switches.

Long story short:

$ odoo --workers=6

is ok, but

$ odoo start --workers=6

is not.

As the automatic subcommands are not used yet, we temporary disable it
until as proper solution is found.
Merge pull request #1387 from odoo-dev/master-disable-subcommand-discovery-fme

[FIX] Temporary disable addons subcommand auto discovery

The problem with the current approach is that it imports all modules in
order to discover which one exposes a subcommand by subclassing
openerp.cli.Command. At that time, the arguments are not parsed in order
to setup the config because a subcommand could potentialy alter the
command line arguments (which is the case of start)

This behavior causes the modules to be imported with the default config and all
the modules using some config keys at startup won't have to value they
are supposed to have when considering the shared command line switches.

Long story short:

$ odoo --workers=6

is ok, but

$ odoo start --workers=6

is not for code that checks the config value at startup (eg: report module)

As the automatic subcommands are not used yet, we temporary disable it
until as proper solution is found.
Cut long names
Merge remote-tracking branch 'upstream/master'