Merge lp:~renatonlima/product-extra-addons/product-extra-addons into lp:product-extra-addons

[Renato Lima - http://www.akretion.com]

fixed products views in product_m2mcategories and product_images.

=== modified file 'product_images/views/product_images_view.xml'
--- product_images/views/product_images_view.xml	2012-09-05 08:40:30 +0000
+++ product_images/views/product_images_view.xml	2012-12-23 02:21:21 +0000
@@ -44,7 +44,7 @@
 			<field name="inherit_id" ref="product.product_normal_form_view" />
 			<field name="type">form</field>
 			<field name="arch" type="xml">
-				<xpath expr="/form/notebook" position="inside">
+				<xpath expr="/form/sheet/notebook" position="inside">
 					<page string="Images">
 						<field name="image_ids" nolabel="1" />
 					</page>

=== modified file 'product_m2mcategories/product_view.xml'
--- product_m2mcategories/product_view.xml	2009-09-20 23:10:21 +0000
+++ product_m2mcategories/product_view.xml	2012-12-23 02:21:21 +0000
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field eval="7" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Information']" position="after">
+                <page string="Information" position="after" version="7.0">
                     <page string="Extra Categories">
                         <separator string="Classification Categories" colspan="2"/>
                         <newline/>
                         <field name="categ_ids" nolabel="1" colspan="2"/>
                     </page>
-                </xpath>
+                </page>
             </field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>