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

[MERGE] merged aag branch with merge of accounting wizard with main application wizard 

bzr revid: qdp-launchpad@openerp.com-20110608091741-sob6m8w1fr53tx8k
This commit is contained in:
Quentin (OpenERP) 2011-06-08 11:17:41 +02:00
parent 092ed01347 f73634dbaa
commit 5a8c819cc1
2 changed files with 11 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
addons/account/account_installer.xml
View File

@ -45,35 +45,20 @@
<record id="view_account_modules_installer" model="ir.ui.view"> <record id="view_account_modules_installer" model="ir.ui.view">
<field name="name">account.installer.modules.form</field> <field name="name">account.installer.modules.form</field>
<field name="model">account.installer.modules</field> <field name="model">base.setup.installer</field>
<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_setup.view_base_setup_installer"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<data> <data>
<form position="attributes"> <xpath expr="//field[@name='report_designer']" position="after">
<attribute name="string">Accounting Application Configuration</attribute> <newline/>
</form> <separator string="Accounting &amp; Finance Features" colspan="4" />
<separator string="title" position="attributes"> <field name="account_voucher"/>
<attribute name="string">Configure Your Accounting Application</attribute> <field name="account_followup"/>
<field name="account_payment"/>
</separator> <field name="account_analytic_plans"/>
<xpath expr="//label[@string='description']" position="attributes"> <field name="account_anglo_saxon"/>
<attribute name="string">Add extra Accounting functionalities to the ones already installed.</attribute>
</xpath> </xpath>
<xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">Configure</attribute>
</xpath>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='string'></attribute>
</xpath>
<group colspan="8">
<field name="account_voucher"/>
<field name="account_followup"/>
<field name="account_payment"/>
<field name="account_analytic_plans"/>
<field name="account_anglo_saxon"/>
<!-- <field name="account_voucher_payment"/>-->
</group>
</data> </data>
</field> </field>
</record> </record>
@ -88,16 +73,6 @@
<field name="target">new</field> <field name="target">new</field>
</record> </record>
<record id="action_account_installer" model="ir.actions.act_window">
<field name="name">Accounting Application Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.installer.modules</field>
<field name="view_id" ref="view_account_modules_installer"/>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<record id="category_accounting_configuration" model="ir.actions.todo.category"> <record id="category_accounting_configuration" model="ir.actions.todo.category">
<field name="name">Accounting</field> <field name="name">Accounting</field>
<field name="sequence">5</field> <field name="sequence">5</field>
@ -110,13 +85,5 @@
<field name="type">special</field> <field name="type">special</field>
</record> </record>
<record id="account_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_account_installer"/>
<field name="category_id" ref="category_accounting_configuration"/>
<field name="sequence">5</field>
<field name="type">special</field>
<field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
</record>
</data> </data>
</openerp> </openerp>

3
addons/account/installer.py
View File

@ -245,8 +245,7 @@ class account_installer(osv.osv_memory):
account_installer() account_installer()
class account_installer_modules(osv.osv_memory): class account_installer_modules(osv.osv_memory):
_name = 'account.installer.modules' _inherit = 'base.setup.installer'
_inherit = 'res.config.installer'
_columns = { _columns = {
'account_analytic_plans': fields.boolean('Multiple Analytic Plans', 'account_analytic_plans': fields.boolean('Multiple Analytic Plans',
help="Allows invoice lines to impact multiple analytic accounts " help="Allows invoice lines to impact multiple analytic accounts "