[MERGE] forward port of branch 7.0 up to revid 9668 launchpad_translations_on_behalf_...

bzr revid: chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp

diff --cc addons/account/account.py
index 71b1be3,e37ea0e..4ee9da0
--- 1/addons/account/account.py
--- 2/addons/account/account.py
+++ b/addons/account/account.py
@@@ -3427,10 -3463,10 +3429,10 @@@ class wizard_multi_charts_accounts(osv.
                  try:
                      tmp2 = obj_data.get_object_reference(cr, uid, *ref)
                      if tmp2: 
 -                        self.pool.get(tmp2[0]).write(cr, uid, tmp2[1], {
 +                        self.pool[tmp2[0]].write(cr, uid, tmp2[1], {
                              'currency_id': obj_wizard.currency_id.id
                          })
-                 except ValueError, e:
+                 except ValueError:
                      pass
  
          # If the floats for sale/purchase rates have been filled, create templates from them

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

diff --cc addons/crm/wizard/crm_lead_to_opportunity.py
index f239ad7,0b73ce4..8ce2aa1
--- 1/addons/crm/wizard/crm_lead_to_opportunity.py
--- 2/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@@ -34,10 -35,11 +34,13 @@@ class crm_lead2opportunity_partner(osv.
                  ('merge', 'Merge with existing opportunities')
              ], 'Conversion Action', required=True),
          'opportunity_ids': fields.many2many('crm.lead', string='Opportunities'),
 +        'user_id': fields.many2one('res.users', 'Salesperson', select=True),
 +        'section_id': fields.many2one('crm.case.section', 'Sales Team', select=True),
      }
  
+     def onchange_action(self, cr, uid, ids, action, context=None):
+         return {'value': {'partner_id': False if action != 'exist' else self._find_matching_partner(cr, uid, context=context)}}
+ 
      def default_get(self, cr, uid, fields, context=None):
          """
          Default get for name, opportunity_ids.

diff --cc addons/crm/wizard/crm_lead_to_opportunity_view.xml
Simple merge

diff --cc addons/crm_claim/report/crm_claim_report_view.xml
index 2d0787c,8fb4698..965c4b5
--- 1/addons/crm_claim/report/crm_claim_report_view.xml
--- 2/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@@ -49,9 -50,15 +49,11 @@@
              <field name="model">crm.claim.report</field>
              <field name="arch" type="xml">
                  <search string="Search">
 -                    <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
 -                    <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]"/>
 -                    <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
 -                    <separator/>
 -                    <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" />
 +                    <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" groups="base.group_multi_salesteams"/>
                      <separator/>
-                     <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
+                     <!-- A 'My Company' filter makes no sense regarding record rules, and is not possible to do (uid is not a company): remove me in 8.0 -->
+                     <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[]" help="My company"
+                         invisible="1"/>
                      <separator/>
                      <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                      <field name="company_id" groups="base.group_multi_company"/>

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

diff --cc addons/mail/static/src/css/mail.css
Simple merge

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

diff --cc addons/purchase/purchase_view.xml
Simple merge

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

diff --cc addons/sale_stock/res_config.py
Simple merge

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

diff --cc addons/stock/stock.py
index c663716,484bdc4..69d2c6e
--- 1/addons/stock/stock.py
--- 2/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@@ -1359,14 -1366,14 +1359,14 @@@ class stock_picking(osv.osv)
                  # Then we finish the good picking
                  self.write(cr, uid, [pick.id], {'backorder_id': new_picking})
                  self.action_move(cr, uid, [new_picking], context=context)
 -                wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_done', cr)
 -                wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
 +                self.signal_button_done(cr, uid, [new_picking])
 +                workflow.trg_write(uid, 'stock.picking', pick.id, cr)
-                 delivered_pack_id = new_picking
+                 delivered_pack_id = pick.id
                  back_order_name = self.browse(cr, uid, delivered_pack_id, context=context).name
-                 self.message_post(cr, uid, ids, body=_("Back order <em>%s</em> has been <b>created</b>.") % (back_order_name), context=context)
+                 self.message_post(cr, uid, new_picking, body=_("Back order <em>%s</em> has been <b>created</b>.") % (back_order_name), context=context)
              else:
                  self.action_move(cr, uid, [pick.id], context=context)
 -                wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_done', cr)
 +                self.signal_button_done(cr, uid, [pick.id])
                  delivered_pack_id = pick.id
  
              delivered_pack = self.browse(cr, uid, delivered_pack_id, context=context)