avanzosc team mailing list archive

["Oihane \(Avanzosc\)" <oihanecruce@xxxxxxxxx>]

Oihane (Avanzosc) has proposed merging lp:~avanzosc-security-team/avanzosc/72h_dos_product_additional_info into lp:~avanzosc-security-team/avanzosc/72horas.

Requested reviews:
  Pedro Manuel Baeza (pedro.baeza)

For more details, see:
https://code.launchpad.net/~avanzosc-security-team/avanzosc/72h_dos_product_additional_info/+merge/225983

Corregidos errores de instalación
-- 
https://code.launchpad.net/~avanzosc-security-team/avanzosc/72h_dos_product_additional_info/+merge/225983
Your team Avanzosc_security is subscribed to branch lp:~avanzosc-security-team/avanzosc/72horas.

=== modified file 'dos_product_additional_info/__openerp__.py'
--- dos_product_additional_info/__openerp__.py	2014-06-17 10:57:17 +0000
+++ dos_product_additional_info/__openerp__.py	2014-07-08 14:18:49 +0000
@@ -28,7 +28,7 @@
     "website": "www.dos-sl.es",
     "description": "This module adds extra information to products",
     "depends": ['product'],
-    "data": ['view/product_view.xml'],
+    "data": ['views/product_view.xml'],
     "active": False,
     "installable": True
 }

=== modified file 'dos_product_additional_info/views/product_view.xml'
--- dos_product_additional_info/views/product_view.xml	2014-06-17 11:44:38 +0000
+++ dos_product_additional_info/views/product_view.xml	2014-07-08 14:18:49 +0000
@@ -1,48 +1,53 @@
 <?xml version="1.0"?>
 <openerp>
-	<data> 
-	
-		<!-- Product Inherit Tree View -->
+    <data>
+
+        <!-- Product Inherit Tree View -->
         <record id="view_product_additional_info_tree" model="ir.ui.view">
             <field name="name">product.additional.info.tree</field>
             <field name="model">product.product</field>
-			<field name="inherit_id" ref="product.product_product_tree_view"/>
-            <field name="arch" type="xml">
-				<field name="state" position="before">
-					<field name="commissionable" />
-				</field>
-            </field>
-        </record>
-		
-		<!-- Product Inherit Form View -->
-		<record id="view_product_additional_info_form" model="ir.ui.view">
-			<field name="name">product.additional.info.form</field>
-			<field name="model">product.product</field>
-			<field name="inherit_id" ref="product.product_normal_form_view"/>
-			<field name="arch" type="xml">
-				<field name="purchase_ok" position="after">
-					<field name="commissionable" />
-				</field>
-				<field name="list_price" position="after">
-					<field name="discount" />
-				</field>
-				<field name="supply_method" position="after">
-					<field name="unitary_prod_order" />
-				</field>
-			</field>
-		</record>
-		
-		<record id="view_product_additional_stocks_form" model="ir.ui.view">
+            <field name="inherit_id" ref="product.product_product_tree_view" />
+            <field name="arch" type="xml">
+                <field name="state" position="before">
+                    <field name="commissionable" />
+                </field>
+            </field>
+        </record>
+
+        <!-- Product Inherit Form View -->
+        <record id="view_product_additional_info_form" model="ir.ui.view">
+            <field name="name">product.additional.info.form</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view" />
+            <field name="arch" type="xml">
+                <field name="purchase_ok" position="after">
+                    <field name="commissionable" />
+                </field>
+                <field name="list_price" position="after">
+                    <field name="discount" />
+                </field>
+                <field name="supply_method" position="after">
+                    <field name="unitary_prod_order" />
+                </field>
+            </field>
+        </record>
+
+        <record id="view_product_additional_stocks_form" model="ir.ui.view">
             <field name="name">product.additional.stocks.form</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="stock.view_normal_property_form"/>
+            <field name="inherit_id"
+                ref="stock.view_normal_procurement_locations_form" />
             <field name="arch" type="xml">
                 <field name="property_stock_inventory" position="after">
-					<field name="property_stock_finished_product" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','internal')]"/>
-					<field name="property_stock_consumer_product" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','internal')]"/>
-				</field>
+                    <field name="property_stock_finished_product"
+                        attrs="{'readonly':[('type','=','service')]}"
+                        domain="[('usage','=','internal')]" />
+                    <field name="property_stock_consumer_product"
+                        attrs="{'readonly':[('type','=','service')]}"
+                        domain="[('usage','=','internal')]" />
+                </field>
             </field>
         </record>
-		
-	</data>
+
+    </data>
 </openerp>