← Back to team overview

avanzosc team mailing list archive

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

 

Review: Needs Fixing code review

Algunas cosillas más.

Diff comments:

> === 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 14:00:32 +0000
> @@ -6,53 +6,39 @@
>              <field name="name">Fix Contract Price</field>
>              <field name="model">fix.price</field>
>              <field name="arch" type="xml">
> -                <form string="Fix Contract Price">
> -                    <newline />
> -                    <group colspan="4" col="4" states="choose">
> -                        <field name="partner" domain="[('customer','=',True)]"
> -                            colspan="4" />
> -                        <newline />
> +                <form string="Fix Contract Price" version="7.0">
> +                    <group states="choose">
> +                        <field name="partner" domain="[('customer','=',True)]" />
>                          <field name="elevator"
> -                            domain="[('tipo_cliente','=','ascensorista')]"
> -                            colspan="4" />
> -                        <newline />
> -                        <field name="contract" colspan="4" />
> -                        <newline />
> -                        <field name="contract_type" colspan="4" />
> -                        <newline />
> +                            domain="[('tipo_cliente','=','ascensorista')]" />
> +                        <field name="contract" />
> +                        <field name="contract_type" />
>                          <field name="value" />
>                          <field name="percent" />
>                          <field invisible="1" name="state" />
> -                        <label colspan="4" />
> -                        <separator colspan="4" />
>                      </group>
> -
> -                    <group colspan="4" col="4" states="get">
> -                        <separator colspan="4"
> -                            string="Process completed with exit" />
> -                        <label colspan="4"
> +                    <group states="get">
> +                        <separator string="Process completed with exit" />
> +                        <p
>                              string="If you want repeat this process, push Go Back button." />

¿Esto funciona bien? Normalmente, lo que se pone es:

<p>If you want repeat this process, push Go Back button.</p>

> -                        <label colspan="4" />
> -                        <label colspan="4"
> -                            string="If you finish, push Close button." />
> -                        <label colspan="4" />
> -                        <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>
> +                        <p string="If you finish, push Close button." />

Ídem

> +                    </group>
> +                    <footer>
> +                        <group 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}" />
> +                            <label string="or" />

Basta sólo con poner "or", sin label ni nada

> +                            <button class="oe_link" special="cancel"
> +                                string="Cancel" icon="gtk-cancel" />
> +                        </group>
> +                        <group states="get">
> +                            <button name="go_back" string="Go back"
> +                                type="object" icon="" />
> +                            <button class="oe_link" special="cancel"

Hay que poner "or"

> +                                string="Close" icon="gtk-cancel" />
> +                        </group>
> +                    </footer>
>                  </form>
>              </field>
>          </record>
> 


-- 
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.


References