[MERGE] forward port of branch 8.0 up to c92e70b

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

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

diff --cc addons/crm/crm_lead.py
index 2c06865,992e4f3..e259de4
--- 1/addons/crm/crm_lead.py
--- 2/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@@ -787,9 -791,9 +787,9 @@@ class crm_lead(format_address, osv.osv)
                  continue
              if not partner_id and action == 'create':
                  partner_id = self._create_lead_partner(cr, uid, lead, context)
 -                self.pool['res.partner'].write(cr, uid, partner_id, {'section_id': lead.section_id and lead.section_id.id or False})
 +                self.pool['res.partner'].write(cr, uid, partner_id, {'team_id': lead.team_id and lead.team_id.id or False})
              if partner_id:
-                 lead.write({'partner_id': partner_id}, context=context)
+                 lead.write({'partner_id': partner_id})
              partner_ids[lead.id] = partner_id
          return partner_ids
  

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

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

diff --cc addons/hr_timesheet/security/ir.model.access.csv
index b489887,3673a3d..757cd84
--- 1/addons/hr_timesheet/security/ir.model.access.csv
--- 2/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@@ -9,4 -9,5 +9,5 @@@ access_product_template_hr_timesheet,pr
  access_product_uom_hr_timesheet,product.uom.hr.timesheet,product.model_product_uom,base.group_hr_user,1,1,1,1\r
  access_account_fiscalyear_hr_user,account.account.fiscalyear.user,account.model_account_fiscalyear,base.group_hr_user,1,1,1,1\r
  access_hr_analytic_timesheet_user,hr.analytic.timesheet.user,model_hr_analytic_timesheet,base.group_user,1,1,1,0\r
 -access_account_analytic_journal_user,account.account.analytic.journal.user,account.model_account_analytic_journal,base.group_user,1,0,0,0\r
 +access_account_analytic_journal_user,account.account.analytic.journal.user,analytic.model_account_analytic_journal,base.group_user,1,0,0,0\r
+ access_hr_timesheet_report,hr.timesheet.report,model_hr_timesheet_report,base.group_hr_manager,1,1,0,0\r

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

diff --cc addons/point_of_sale/static/src/css/pos.css
index 2f647bb,db79295..4e63048
--- 1/addons/point_of_sale/static/src/css/pos.css
--- 2/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@@ -1169,9 -1118,9 +1169,12 @@@ td 
  }
  
  @media print {
+     * {
+         color: black !important;
+     }
 +    body {
 +        margin: 0;
 +    }
      .oe_leftbar,
      .pos .pos-topheader, 
      .pos .pos-leftpane, 

diff --cc addons/point_of_sale/static/src/js/models.js
Simple merge

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

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

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

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

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

diff --cc addons/stock/stock_view.xml
Simple merge

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

diff --cc addons/website/views/website_templates.xml
Simple merge

diff --cc addons/website_sale/controllers/main.py
index ab50ac8,6a27e97..d776db0
--- 1/addons/website_sale/controllers/main.py
--- 2/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@@ -179,7 -181,12 +179,8 @@@ class website_sale(http.Controller)
          if search:
              post["search"] = search
          if category:
+             category = pool['product.public.category'].browse(cr, uid, int(category), context=context)
              url = "/shop/category/%s" % slug(category)
 -        pager = request.website.pager(url=url, total=product_count, page=page, step=PPG, scope=7, url_args=post)
 -        product_ids = product_obj.search(cr, uid, domain, limit=PPG, offset=pager['offset'], order='website_published desc, website_sequence desc', context=context)
 -        products = product_obj.browse(cr, uid, product_ids, context=context)
  
          style_obj = pool['product.style']
          style_ids = style_obj.search(cr, uid, [], context=context)

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

diff --cc openerp/models.py
Simple merge