← Back to team overview

avanzosc team mailing list archive

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

 

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

Corregidos errores al instalar
-- 
https://code.launchpad.net/~avanzosc-security-team/avanzosc/72h_dos_fix_contracts_price_unit/+merge/226091
Your team Avanzosc_security is subscribed to branch lp:~avanzosc-security-team/avanzosc/72horas.
=== modified file 'dos_fix_contracts_price_unit/wizard/fix_price_view.xml'
--- dos_fix_contracts_price_unit/wizard/fix_price_view.xml	2014-06-17 07:48:14 +0000
+++ dos_fix_contracts_price_unit/wizard/fix_price_view.xml	2014-07-09 10:12:27 +0000
@@ -6,24 +6,19 @@
             <field name="name">Fix Contract Price</field>
             <field name="model">fix.price</field>
             <field name="arch" type="xml">
-                <form string="Fix Contract Price">
-                    <newline />
+                <form string="Fix Contract Price" version="7.0">
                     <group colspan="4" col="4" states="choose">
                         <field name="partner" domain="[('customer','=',True)]"
                             colspan="4" />
-                        <newline />
                         <field name="elevator"
                             domain="[('tipo_cliente','=','ascensorista')]"
                             colspan="4" />
-                        <newline />
                         <field name="contract" colspan="4" />
-                        <newline />
                         <field name="contract_type" colspan="4" />
-                        <newline />
                         <field name="value" />
                         <field name="percent" />
                         <field invisible="1" name="state" />
-                        <label colspan="4" />
+                        <label colspan="4" string=""/>
                         <separator colspan="4" />
                     </group>
 
@@ -32,27 +27,27 @@
                             string="Process completed with exit" />
                         <label colspan="4"
                             string="If you want repeat this process, push Go Back button." />
-                        <label colspan="4" />
+                        <label colspan="4"  string=""/>
                         <label colspan="4"
                             string="If you finish, push Close button." />
-                        <label colspan="4" />
+                        <label colspan="4" string=""/>
                         <separator colspan="4" />
                     </group>
-
-                    <group colspan="4" col="4" states="choose">
-                        <button special="cancel" string="Cancel"
-                            icon="gtk-cancel" />
-                        <button name="fix_contract_price" string="Fix price"
-                            type="object" icon="gtk-ok"
-                            context="{'partner':partner, 'elevator': elevator, 'contract':contract, 'contract_type': contract_type, 'value': value, 'percent': percent}" />
-                    </group>
-
-                    <group colspan="4" col="4" states="get">
-                        <button name="go_back" string="Go back"
-                            type="object" icon="" />
-                        <button special="cancel" string="Close"
-                            icon="gtk-cancel" />
-                    </group>
+                    <footer>
+                        <group colspan="4" col="4" states="choose">
+                            <button name="fix_contract_price" string="Fix price"
+                                type="object" icon="gtk-ok"
+                                context="{'partner':partner, 'elevator': elevator, 'contract':contract, 'contract_type': contract_type, 'value': value, 'percent': percent}" />
+                            <button special="cancel" string="Cancel"
+                                icon="gtk-cancel" />
+                        </group>
+                        <group colspan="4" col="4" states="get">
+                            <button name="go_back" string="Go back"
+                                type="object" icon="" />
+                            <button special="cancel" string="Close"
+                                icon="gtk-cancel" />
+                        </group>
+                    </footer>
                 </form>
             </field>
         </record>


Follow ups