[MERGE] forward port of branch 8.0 up to 92c7874

diff --cc addons/account/account_bank_statement.py
Simple merge

diff --cc addons/account/account_invoice.py
Simple merge

diff --cc addons/account/partner_view.xml
Simple merge

diff --cc addons/board/static/src/css/dashboard.sass
Simple merge

diff --cc addons/mrp/mrp.py
Simple merge

diff --cc addons/product/product.py
Simple merge

diff --cc addons/stock/stock.py
Simple merge

diff --cc addons/web/static/src/js/openerpframework.js
Simple merge

diff --cc addons/web_calendar/static/src/js/web_calendar.js
Simple merge

diff --cc addons/website/models/website.py
Simple merge

diff --cc addons/website/static/src/js/website.snippets.editor.js
Simple merge

diff --cc addons/website_blog/models/website_blog.py
Simple merge

diff --cc addons/website_blog/views/website_blog_templates.xml
Simple merge

diff --cc addons/website_sale/controllers/main.py
Simple merge

diff --cc addons/website_sale/static/src/css/website_sale.css
index ce978eb,fa5dbd9..f8b637e
--- 1/addons/website_sale/static/src/css/website_sale.css
--- 2/addons/website_sale/static/src/css/website_sale.css
+++ b/addons/website_sale/static/src/css/website_sale.css
@@@ -341,11 -341,27 +341,16 @@@ label.css_attribute_color.css_not_avail
    display: block;
  }
  
+ .oe_website_sale input.js_quantity {
+   min-width: 48px;
+   text-align: center;
+ }
+ 
  /* ---- Publish managment and options ---- */
 -#products_grid .css_options {
 -  display: none;
 -  position: absolute;
 -  top: -6px;
 -  left: 50%;
 -  z-index: 10;
 -}
 -#products_grid .css_options .dropdown {
 -  position: relative;
 -  left: -50%;
 -}
 -#products_grid .css_options .dropdown [name="size"] table {
 +.oe_overlay_options .dropdown ul[name="size"] table {
    margin-left: 20px;
  }
 -#products_grid .css_options .dropdown [name="size"] td {
 +.oe_overlay_options .dropdown ul[name="size"] td {
    margin: 0;
    padding: 0;
    width: 20px;

diff --cc addons/website_sale/static/src/css/website_sale.sass
index d480459,5bb4e9c..9874876
--- 1/addons/website_sale/static/src/css/website_sale.sass
--- 2/addons/website_sale/static/src/css/website_sale.sass
+++ b/addons/website_sale/static/src/css/website_sale.sass
@@@ -287,11 -287,22 +287,15 @@@ label.css_attribute_color.css_not_avail
  .discount .oe_default_price
      display: block
  
+ .oe_website_sale input.js_quantity
+     min-width: 48px
+     text-align: center
+ 
  /* ---- Publish managment and options ---- */
  
 -#products_grid .css_options
 -    display: none
 -    position: absolute
 -    top: -6px
 -    left: 50%
 -    z-index: 10
 +.oe_overlay_options
      .dropdown
 -        position: relative
 -        left: -50%
 -        [name="size"]
 +        ul[name="size"]
              table
                  margin-left: 20px
              td

diff --cc addons/website_sale/views/templates.xml
Simple merge

diff --cc doc/conf.py
Simple merge

diff --cc openerp/addons/base/ir/ir_model.py
Simple merge

diff --cc openerp/models.py
Simple merge

diff --cc openerp/tools/func.py
index 03b4f76,0a36166..f04bacd
--- 1/openerp/tools/func.py
--- 2/openerp/tools/func.py
+++ b/openerp/tools/func.py
@@@ -20,7 -20,7 +20,7 @@@
  #
  ##############################################################################
  
- __all__ = ['synchronized', 'lazy_property', 'conditional']
 -__all__ = ['synchronized', 'lazy_property', 'classproperty']
++__all__ = ['synchronized', 'lazy_property', 'classproperty', 'conditional']
  
  from functools import wraps
  from inspect import getsourcefile