[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9183

rev-id launchpad_translations_on_behalf_of_openerp-20130531070107-7d2k818beg8965ll

bzr revid: odo@openerp.com-20130603121852-jdl6vlo9dmjk0rlc

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

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

diff --cc addons/account/project/project_view.xml
Simple merge

diff --cc addons/account/wizard/pos_box.py
index bd38e6b,5619da0..4b7e635
--- 1/addons/account/wizard/pos_box.py
--- 2/addons/account/wizard/pos_box.py
+++ b/addons/account/wizard/pos_box.py
@@@ -20,9 -20,9 +20,9 @@@ class CashBox(osv.osv_memory)
          active_model = context.get('active_model', False) or False
          active_ids = context.get('active_ids', []) or []
  
 -        records = self.pool.get(active_model).browse(cr, uid, active_ids, context=context)
 +        records = self.pool[active_model].browse(cr, uid, active_ids, context=context)
  
-         return self._run(cr, uid, ids, records, context=None)
+         return self._run(cr, uid, ids, records, context=context)
  
      def _run(self, cr, uid, ids, records, context=None):
          for box in self.browse(cr, uid, ids, context=context):

diff --cc addons/account_followup/account_followup_customers.xml
index 296e662,b704932..fba0bce
--- 1/addons/account_followup/account_followup_customers.xml
--- 2/addons/account_followup/account_followup_customers.xml
+++ b/addons/account_followup/account_followup_customers.xml
@@@ -9,8 -9,8 +9,8 @@@
              <field name="model">res.partner</field>
              <field name="priority" eval="20"/>
              <field name="arch" type="xml">
-                 <tree string="Customer Followup">
+                 <tree string="Customer Followup" create="false" delete="false">
 -                    <field name="name"/>
 +                    <field name="display_name"/>
                      <field name="payment_next_action_date"/>
                      <field name="payment_next_action"/>
                      <field name="user_id" invisible="1"/>

diff --cc addons/account_payment/wizard/account_payment_order.py
Simple merge

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

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

diff --cc addons/procurement/procurement_view.xml
Simple merge

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

diff --cc addons/sale_stock/test/cancel_order_sale_stock.yml
index 9081cac,a739376..d970e0c
--- 1/addons/sale_stock/test/cancel_order_sale_stock.yml
--- 2/addons/sale_stock/test/cancel_order_sale_stock.yml
+++ b/addons/sale_stock/test/cancel_order_sale_stock.yml
@@@ -17,9 -17,11 +17,9 @@@
    Now I cancel latest shipment.
  -
    !python {model: stock.picking}: |
 -    import netsvc
      delivery_orders = self.search(cr, uid, [('sale_id','=',ref("sale.sale_order_8"))])
-     last_delivery_order_id = delivery_orders[0]
+     last_delivery_order_id = delivery_orders[-1]
 -    wf_service = netsvc.LocalService("workflow")
 -    wf_service.trg_validate(uid, 'stock.picking', last_delivery_order_id, 'button_cancel', cr)
 +    self.pool.get('stock.picking').signal_button_cancel(cr, uid, [last_delivery_order_id])
  -
    I run the scheduler.
  -

diff --cc addons/share/wizard/share_wizard.py
index 3a26dcb,ef46160..3b55309
--- 1/addons/share/wizard/share_wizard.py
--- 2/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@@ -412,8 -412,9 +412,9 @@@ class share_wizard(osv.TransientModel)
              if coltype in ttypes and colinfo.column._obj not in models:
                  relation_model_id = model_obj.search(cr, UID_ROOT, [('model','=',coldef._obj)])[0]
                  relation_model_browse = model_obj.browse(cr, UID_ROOT, relation_model_id, context=context)
 -                relation_osv = self.pool.get(coldef._obj)
 +                relation_osv = self.pool[coldef._obj]
-                 if coltype == 'one2many':
+                 #skip virtual one2many fields (related, ...) as there is no reverse relationship
+                 if coltype == 'one2many' and hasattr(coldef, '_fields_id'):
                      # don't record reverse path if it's not a real m2o (that happens, but rarely)
                      dest_model_ci = relation_osv._all_columns
                      reverse_rel = coldef._fields_id

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