Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[IMP] Fix #159 - Improve ther order of the fields in partner and company #160

Merged
merged 1 commit into from Jun 29, 2015
Merged

[IMP] Fix #159 - Improve ther order of the fields in partner and company #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 14 additions & 10 deletions l10n_br_base/views/res_company_view.xml
View file
Open in desktop
Expand Up @@ -6,25 +6,29 @@
<field name="name">view_company_form_inherited</field>
<field name="model">res.company</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<field name="zip" position="attributes">
<attribute name="style">width: 50%%</attribute>
</field>
<field name="arch" type="xml">
<field name="street2" position="replace"/>
<field name="street" position="replace">
<field name="street"/>
<field name="number" placeholder="número"/>
<field name="street2" placeholder="complemento"/>
<field name="district" placeholder="bairro"/>
<field name="zip" position="replace"/>
<field name="street" position="replace">
<field name="zip" placeholder="CEP" style="width:50%" />
<field name="street" placeholder="Logradouro" />
<field name="number" placeholder="Número"/>
<field name="street2" placeholder="Complemento"/>
<field name="district" placeholder="Bairro"/>
</field>
<field name="state_id" position="attributes">
<attribute name="domain">[('country_id','=',country_id)]</attribute>
<attribute name="style">width:100%</attribute>
</field>
<field name="parent_id" position="before">
<field name="legal_name" placeholder="Razão Social"/>
</field>
<field name="country_id" position="replace"/>
<field name="state_id" position="before">
<field name="country_id" placeholder="País" />
</field>
<field name="state_id" position="after">
<field name="l10n_br_city_id" placeholder="cidade"/>
<field name="l10n_br_city_id" placeholder="Cidade"/>
</field>
<field name="city" position="replace">
<field name="city" invisible="1"/>
Expand Down
23 changes: 13 additions & 10 deletions l10n_br_base/views/res_partner_view.xml
View file
Open in desktop
Expand Up @@ -48,26 +48,29 @@
<field colspan="4" name="cnpj_cpf" nolabel="1" />
</group>
</field>
<field name="street2" position="replace"/>
<field name="zip" position="replace"/>
<field name="street" position="replace">
<field name="street" placeholder="Endereço"/>
<field name="number" placeholder="Número" />
<field name="district" placeholder="Bairro" />
</field>
<field name="street2" position="replace">
<field name="zip" placeholder="CEP" style="width:50%" />
<field name="street" placeholder="Logradouro" />
<field name="number" placeholder="Número"/>
<field name="street2" placeholder="Complemento"/>
<field name="district" placeholder="Bairro"/>
</field>
<field name="state_id" position="attributes">
<attribute name="domain">[('country_id','=',country_id)]</attribute>
<attribute name="style">width:100%</attribute>
</field>
<field name="country_id" position="replace"/>
<field name="state_id" position="before">
<field name="country_id" placeholder="País" />
</field>
<field name="state_id" position="after">
<field name="l10n_br_city_id" placeholder="cidade"/>
<field name="l10n_br_city_id" placeholder="Cidade"/>
</field>
<field name="city" position="replace">
<field name="city" invisible="1" />
</field>
<field name="zip" position="attributes">
<attribute name="style">width: 50%</attribute>
</field>
</field>
<notebook>
<page position="inside" string="Outros Dados">
<group string="Dados Fiscais">
Expand Down