← Back to team overview

avanzosc team mailing list archive

[Merge] lp:~avanzosc-security-team/avanzosc/72h_dos_services_to_invoice into lp:~avanzosc-security-team/avanzosc/72horas

 

Oihane (Avanzosc) has proposed merging lp:~avanzosc-security-team/avanzosc/72h_dos_services_to_invoice 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_services_to_invoice/+merge/226071

Hay una vista que coge sale_layout que he comentado (pendiente de revisar)
-- 
https://code.launchpad.net/~avanzosc-security-team/avanzosc/72h_dos_services_to_invoice/+merge/226071
Your team Avanzosc_security is subscribed to branch lp:~avanzosc-security-team/avanzosc/72horas.
=== modified file 'dos_services_to_invoice/__openerp__.py'
--- dos_services_to_invoice/__openerp__.py	2014-06-25 13:59:47 +0000
+++ dos_services_to_invoice/__openerp__.py	2014-07-09 08:05:03 +0000
@@ -27,9 +27,15 @@
     "description": """
     This module allows you to add services to invoice on the products.
     """,
-    "depends": ['product', 'sale', 'dos_stock_warehouse_additional_info',
-                'dos_product_additional_info',
-                ],
-    "data": ['view/product_view.xml', 'view/sale_order_line_view.xml'],
+    "depends": [
+        'product',
+        'sale',
+        'dos_stock_warehouse_additional_info',
+        'dos_product_additional_info',
+    ],
+    "data": [
+        'views/product_view.xml',
+         # 'views/sale_order_line_view.xml'
+    ],
     "installable": True
 }

=== modified file 'dos_services_to_invoice/views/product_view.xml'
--- dos_services_to_invoice/views/product_view.xml	2014-06-25 11:28:48 +0000
+++ dos_services_to_invoice/views/product_view.xml	2014-07-09 08:05:03 +0000
@@ -8,7 +8,7 @@
 			<field name="model">product.product</field>
 			<field name="inherit_id" ref="product.product_normal_form_view"/>
 			<field name="arch" type="xml">
-				<page string="Packaging" position="after">
+				<page string="Sales" position="after">
 					<page string="Services">
 						<field name="product_services_ids" colspan="4" 
 							   domain="[('type','=','service')]" nolabel="1" /> 


Follow ups