[IMP] product: improve field labels about variant/attributes distinction
[MERGE] product: refactoring of product variants.

close PR #222
Merge branch 'master-wmsstatbut-jco' into master-wmsstaging-jco
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged

Conflicts:
	addons/mrp/mrp_view.xml
Merge branch 'master-wmssecurity3-jco' into master-wmsstaging-jco
Added ir.model.access in manifest
[FIX] fix wrong conflict resolution in merge

The merge #5142037 from odoo/master in local branch was wrong.
I basically overwrote the changes from master.  This commit resolves
the issue correctly.
Merge remote-tracking branch 'odoo/master' into master-wmsstaging-jco
[FIX] website_mail_group: fixed discussion group data, wrongly forward-ported
[FIX] use _.isEmpty instead of Object.keys

Object.keys is not supported by all browsers (*cough* IE *cough*).
Also, bonus, isEmpty is more readable and more 'semantic'
Basic support for xml data files
[FIX] crop the text in drawer when it is too long
[FIX] change css to prevent unreachable fields

in drawer, advanced search, it can happen that the form extends out
of the drawer.  Overflow:auto at least allows the user to interact
properly with the form.
[IMP] update value
[IMP] claim form
[FIX] fix the add to dashboard widget (web client)

The dashboard widget didn't work because it tried to look for its
parent view, but the searchview has been split in searchview and drawer.
This patch makes sure it looks for the data in the correct place.
[FIX] compute the correct offset to adjust view

the jquery method length() compute the height of its element, even if
it is diplay:none.  But in our case, we want the offset to be zero if
there is no visible view_manager_header.  (for example, general settings
in settings menu)
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
[REV][FIX] Reverting regression introduced in forward-port
04211015fc3d4be2a8c65b9d977c2d9c4dac8be7
[FIX] website: fix incomplete refactoring