avanzosc team mailing list archive

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

Oihane (Avanzosc) has proposed merging lp:~avanzosc-security-team/avanzosc/72h_dos_contracts_models 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_contracts_models/+merge/226090
-- 
https://code.launchpad.net/~avanzosc-security-team/avanzosc/72h_dos_contracts_models/+merge/226090
Your team Avanzosc_security is subscribed to branch lp:~avanzosc-security-team/avanzosc/72horas.

=== modified file 'dos_contracts_models/__openerp__.py'
--- dos_contracts_models/__openerp__.py	2014-06-16 14:08:45 +0000
+++ dos_contracts_models/__openerp__.py	2014-07-09 10:11:53 +0000
@@ -27,7 +27,9 @@
     "category": "Enterprise Specific Modules",
     "website": "www.dos-sl.es",
     "description": "This module allows to manage model contracts.",
-    "depends": [],
+    "depends": [
+        "dos_contracts",
+    ],
     "data": [
         "wizard/generate_contracts_view.xml",
         "views/contract_model_view.xml",

=== modified file 'dos_contracts_models/wizard/generate_contracts_view.xml'
--- dos_contracts_models/wizard/generate_contracts_view.xml	2014-07-07 08:06:44 +0000
+++ dos_contracts_models/wizard/generate_contracts_view.xml	2014-07-09 10:11:53 +0000
@@ -5,15 +5,14 @@
             <field name="name">Generate Contract</field>
             <field name="model">generate.contract</field>
             <field name="arch" type="xml">
-                <form string="Generate Contract">
+                <form string="Generate Contract" version="7.0">
                     <group col="8">
                         <group colspan="3">
-                            <newline />
                             <label colspan="4" width="220"
                                 string="Choose contract type, contract model and date contract." />
                             <label colspan="4" width="220"
                                 string="Choose partner and elevator." />
-                            <label colspan="4" width="220" />
+                            <label colspan="4" width="220" string="" />
                             <label colspan="4" width="220"
                                 string="Push generate button to create new contract." />
                         </group>
@@ -26,15 +25,13 @@
                                 width="400">
                                 <field name="contract_type"
                                     colspan="4" />
-                                <newline />
                                 <field name="model" colspan="4" />
-                                <newline />
                             </group>
                             <group states="choose" colspan="4"
                                 width="400">
                                 <field name="date_contract" />
-                                <label colspan="2" width="180" />
-                                <newline />
+                                <label colspan="2" width="180"
+                                    string="" />
                             </group>
                             <group states="choose">
                                 <separator string="Partner"
@@ -42,13 +39,11 @@
                                 <field name="partner" nolabel="1"
                                     colspan="4"
                                     domain="[('tipo_cliente','=','particular')]" />
-                                <newline />
                                 <separator string="Elevator"
                                     colspan="4" />
                                 <field name="elevator" colspan="4"
                                     nolabel="1"
                                     domain="[('tipo_cliente','=','ascensorista')]" />
-                                <newline />
                             </group>
                             <group colspan="4" states="get">
                                 <field name="name" invisible="1"
@@ -61,7 +56,8 @@
                         <footer>
                             <group colspan="8" col="8" states="choose">
                                 <field invisible="1" name="state" />
-                                <label colspan="6" width="220" />
+                                <label colspan="6" width="220"
+                                    string="" />
                                 <button name="generate" string="Generate"
                                     type="object" icon="gtk-ok"
                                     context="{'model':model, 'partner': partner, 'elevator': elevator, 'contract_type': contract_type, 'date_contract':date_contract}" />
@@ -69,7 +65,8 @@
                                     string="Cancel" icon="gtk-cancel" />
                             </group>
                             <group colspan="8" col="8" states="get">
-                                <label colspan="7" width="220" />
+                                <label colspan="7" width="220"
+                                    string="" />
                                 <button special="cancel" string="Exit"
                                     icon="gtk-cancel" />
                             </group>