Atik Agewan(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-configuration-rework-remain-all-aag
into lp:~openerp-dev/openobject-addons/trunk-configuration-rework.
Requested reviews:
Rucha (Open ERP) (rpa-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-rework-remain-all-aag/+merge/63521
Hello
Account Install config wiz is merged with Install Application Wiz.
Thanks
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-rework-remain-all-aag/+merge/63521
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-configuration-rework.
=== modified file 'account/account_installer.xml'
--- account/account_installer.xml 2011-04-08 12:28:11 +0000
+++ account/account_installer.xml 2011-06-06 06:51:29 +0000
@@ -45,35 +45,20 @@
<record id="view_account_modules_installer" model="ir.ui.view">
<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="inherit_id" ref="base.res_config_installer"/>
+ <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
<field name="arch" type="xml">
<data>
- <form position="attributes">
- <attribute name="string">Accounting Application Configuration</attribute>
- </form>
- <separator string="title" position="attributes">
- <attribute name="string">Configure Your Accounting Application</attribute>
-
- </separator>
- <xpath expr="//label[@string='description']" position="attributes">
- <attribute name="string">Add extra Accounting functionalities to the ones already installed.</attribute>
- </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>
+ <xpath expr="//field[@name='report_designer']" position="after">
+ <newline/>
+ <separator string="Accounting & Finance Features" colspan="4" />
+ <field name="account_voucher"/>
+ <field name="account_followup"/>
+ <field name="account_payment"/>
+ <field name="account_analytic_plans"/>
+ <field name="account_anglo_saxon"/>
+ </xpath>
</data>
</field>
</record>
@@ -88,28 +73,11 @@
<field name="target">new</field>
</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="account_configuration_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_account_configuration_installer"/>
<field name="sequence">3</field>
<field name="type">special</field>
</record>
- <record id="account_installer_todo" model="ir.actions.todo">
- <field name="action_id" ref="action_account_installer"/>
- <field name="sequence">5</field>
- <field name="type">special</field>
- <field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
- </record>
-
</data>
</openerp>
=== modified file 'account/installer.py'
--- account/installer.py 2011-03-24 13:11:44 +0000
+++ account/installer.py 2011-06-06 06:51:29 +0000
@@ -245,8 +245,7 @@
account_installer()
class account_installer_modules(osv.osv_memory):
- _name = 'account.installer.modules'
- _inherit = 'res.config.installer'
+ _inherit = 'base.setup.installer'
_columns = {
'account_analytic_plans': fields.boolean('Multiple Analytic Plans',
help="Allows invoice lines to impact multiple analytic accounts "
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
