[MERGE] from trunk

bzr revid: fva@openerp.com-20121004093752-gmn8qigyafd30wb5

addons/account/account_invoice_view.xml

@@ -189,7 +189,7 @@
                     </group>
                     <notebook>
                         <page string="Invoice">
-                            <field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line">
+                            <field context="{'partner_id': partner_id, 'price_type': context.get('price_type') or False, 'type': type}" name="invoice_line">
                                 <tree string="Invoice lines" editable="bottom">
                                     <field name="product_id"
                                         on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>

addons/auth_oauth/__openerp__.py

@@ -34,6 +34,7 @@ Allow users to login through Google OAuth2.
     'depends': ['base', 'web', 'base_setup'],
     'data': [
         'auth_oauth_data.xml',
+        'auth_oauth_data.yml',
         'auth_oauth_view.xml',
         'security/ir.model.access.csv'
     ],

addons/auth_oauth/auth_oauth_data.yml

@@ -0,0 +1,6 @@
+-
+  Use database uuid as client_id for OpenERP oauth provider
+-
+  !python {model: ir.config_parameter}: |
+    oauth = self.pool.get('auth.oauth.provider')
+    oauth.write(cr, uid, [ref('provider_openerp')], {'client_id': self.get_param(cr, uid, 'database.uuid')})