odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] account: clean up wizard forms 

bzr revid: rco@openerp.com-20120620080737-vtl4mso2o32pm8ze
This commit is contained in:
Raphael Collet 2012-06-20 10:07:37 +02:00
parent 2f5887a787
commit abced46e7c
2 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
addons/account/account_installer.xml
View File

@ -6,31 +6,28 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="base.res_config_installer"/> <field name="inherit_id" ref="base.res_config_installer"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form position="attributes"> <form position="attributes" version="7.0">
<attribute name="string">Accounting Application Configuration</attribute> <attribute name="string">Accounting Application Configuration</attribute>
</form> </form>
<button name="action_skip" position="replace"/> <button name="action_skip" position="replace"/>
<button name="action_next" position="attributes"> <button name="action_next" position="attributes">
<attribute name="string">Continue</attribute> <attribute name="string">Continue</attribute>
<attribute name="class">oe_form_button_save_dirty</attribute>
</button> </button>
<separator string="title" position="replace"> <separator string="title" position="replace">
<group> <group string="Select an Accounting Setup">
<group string="Select an Accounting Setup"> <label colspan="2" string="This will automatically configure your taxes and accounts."/>
<label colspan="2" string="This will automatically configure your taxes and accounts."/> <field name="charts"/>
<field name="charts"/> </group>
</group> <group string="Configure your Fiscal Year" groups="account.group_account_user">
<group string="Configure your Fiscal Year" groups="account.group_account_user"> <field name="has_default_company" invisible="1" />
<field name="has_default_company" invisible="1" /> <field name="company_id" colspan="4" widget="selection" attrs="{'invisible' : [('has_default_company', '=', True)]}"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
<field name="company_id" colspan="4" widget="selection" attrs="{'invisible' : [('has_default_company', '=', True)]}"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it --> <label for="date_start" string="Date Range"/>
<label for="date_start" string="Date Range"/> <div>
<div> <field name="date_start" on_change="on_change_start_date(date_start)" class="oe_inline"/> -
<field name="date_start" on_change="on_change_start_date(date_start)" class="oe_inline"/> - <field name="date_stop" class="oe_inline"/>
<field name="date_stop" class="oe_inline"/> </div>
</div> <field name="period"/>
<field name="period"/> </group>
</group>
</group>
</separator> </separator>
</field> </field>
</record> </record>

24
addons/account/account_view.xml
View File

@ -2357,9 +2357,6 @@
<attribute name="string">Accounting Application Configuration</attribute> <attribute name="string">Accounting Application Configuration</attribute>
</form> </form>
<button name="action_skip" position="replace"/> <button name="action_skip" position="replace"/>
<button name="action_next" position="attributes">
<attribute name="class">oe_form_button_save_dirty</attribute>
</button>
<group string="res_config_contents" position="replace"> <group string="res_config_contents" position="replace">
<field name="only_one_chart_template" invisible="1"/> <field name="only_one_chart_template" invisible="1"/>
<field name="complete_tax_set" invisible="1"/> <field name="complete_tax_set" invisible="1"/>
@ -2390,17 +2387,16 @@
</div> </div>
</group> </group>
</group> </group>
<notebook> <div groups="account.group_account_user">
<page string="Bank Accounts"> <label for="bank_accounts_id" string="Bank Information"/>
<field name="bank_accounts_id" groups="account.group_account_user"> <field name="bank_accounts_id">
<tree string="Bank Information" editable="bottom"> <tree editable="bottom">
<field name="acc_name"/> <field name="acc_name"/>
<field name="account_type"/> <field name="account_type"/>
<field name="currency_id" widget="selection"/> <field name="currency_id" widget="selection"/>
</tree> </tree>
</field> </field>
</page> </div>
</notebook>
</group> </group>
</field> </field>
</record> </record>