Merge lp:~camptocamp/openerp-product-attributes/7.0-fix_1296605-afe into lp:~product-core-editors/openerp-product-attributes/7.0

[Alexandre Fayolle - camptocamp]

customer_context_in_product_view: fix oid in view

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks

review: Approve

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

LGTM

review: Approve (no test, code review)

[Leonardo Pistone (lepistone)]

OK!
Small thing: I don't undertand the way the diff is displayed about the last line: you fixed the missing newline or you took it out?

review: Approve (code review)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Leonardo I would say a end of line was added.

Thanks Alexandre LGTM

review: Approve

[Graeme Gellatly (gdgellatly)]

review: Approve

=== modified file 'customer_context_in_product_view/partner_pricelist_view.xml'
--- customer_context_in_product_view/partner_pricelist_view.xml	2014-02-14 21:09:26 +0000
+++ customer_context_in_product_view/partner_pricelist_view.xml	2014-03-24 09:52:31 +0000
@@ -30,7 +30,7 @@
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
-                    <button name="%(partner_price_in_product_view.act_res_partner_pricing)d" type="action"
+                    <button name="%(customer_context_in_product_view.act_res_partner_pricing)d" type="action"
                         string="Product Pricing" groups="base.group_sale_salesman"
                         attrs="{'invisibile': [('customer', '=', 'False')]}"/>
                 </xpath>
@@ -38,4 +38,4 @@
         </record>
         
     </data>
-</openerp>
 \ No newline at end of file
+</openerp>