openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #05976
lp:~openerp-dev/openobject-addons/trunk-rework-21Apr-addons-aag into lp:~openerp-dev/openobject-addons/trunk-configuration-rework
Atik Agewan(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-rework-21Apr-addons-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-rework-21Apr-addons-aag/+merge/59165
Hello
In this we merged the wizards like 'configure your HR application' with the wizard 'install new
application' by Inherit hr_installer in base.setup.installer.
same way Porject and crm config wizard merged in Install Application wiz
Thanks
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-rework-21Apr-addons-aag/+merge/59165
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-configuration-rework.
=== modified file 'account/i18n/pt_BR.po'
--- account/i18n/pt_BR.po 2011-04-22 04:39:06 +0000
+++ account/i18n/pt_BR.po 2011-04-27 05:38:07 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-21 21:39+0000\n"
"Last-Translator: Nédio Batista Marques <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-04-19 14:37+0000\n"
+"Last-Translator: Nédio Batista Marques <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-22 04:38+0000\n"
"X-Generator: Launchpad (build 12758)\n"
+=======
+"X-Launchpad-Export-Date: 2011-04-20 04:36+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
=== modified file 'account_payment/account_payment.py'
=== modified file 'base_setup/base_setup_installer.xml'
--- base_setup/base_setup_installer.xml 2011-04-13 10:50:56 +0000
+++ base_setup/base_setup_installer.xml 2011-04-27 05:38:07 +0000
@@ -25,7 +25,7 @@
<attribute name="string">Install Applications</attribute>
</separator>
- <group colspan="8">
+ <group colspan="8" col="2">
<field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
<field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
<field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
=== modified file 'crm/crm_installer.py'
--- crm/crm_installer.py 2011-01-14 00:11:01 +0000
+++ crm/crm_installer.py 2011-04-27 05:38:07 +0000
@@ -23,8 +23,8 @@
from osv import fields, osv
class crm_installer(osv.osv_memory):
- _name = 'crm.installer'
- _inherit = 'res.config.installer'
+
+ _inherit = 'base.setup.installer'
_columns = {
'name': fields.char('Name', size=64),
=== modified file 'crm/crm_installer_view.xml'
--- crm/crm_installer_view.xml 2011-04-14 11:30:49 +0000
+++ crm/crm_installer_view.xml 2011-04-27 05:38:07 +0000
@@ -2,11 +2,12 @@
<data>
<record id="view_crm_installer" model="ir.ui.view">
<field name="name">crm.installer.view</field>
- <field name="model">crm.installer</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">CRM Application Configuration</attribute>
</form>
@@ -44,10 +45,29 @@
<field name="outlook" />
</group>
</group>
+ -->
+ <xpath expr="//field[@name='crm']" position="after">
+ <group attrs="{'invisible':[('crm','=',False)]}" >
+ </group>
+ <group attrs="{'invisible':[('crm','=',False)]}" >
+ <separator string="Configure Your CRM Application" colspan="4"/>
+ <field name="crm_claim" />
+ <field name="crm_helpdesk" />
+ <field name="crm_fundraising" />
+ <field name="wiki_sale_faq"/>
+ <field name="sale_crm" invisible="1"/>
+ <separator string="Synchronization" colspan="4"/>
+ <field name="crm_caldav" />
+ <field name="fetchmail" />
+ <separator string="Plug-In" colspan="4" />
+ <field name="thunderbird" />
+ <field name="outlook" />
+ </group>
+ </xpath>
</data>
</field>
</record>
-
+ <!--
<record id="action_crm_installer" model="ir.actions.act_window">
<field name="name">CRM Application Configuration</field>
<field name="type">ir.actions.act_window</field>
@@ -64,36 +84,74 @@
<field name="type">special</field>
<field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
</record>
-
- <record model="ir.actions.act_window" id="crm_case_section_view_form_installer">
- <field name="name">Create sales team</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">crm.case.section</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="view_id" ref="crm.crm_case_section_view_form"/>
- </record>
-
- <record id="crm_case_section_installer_todo" model="ir.actions.todo">
- <field name="action_id" ref="crm_case_section_view_form_installer"/>
- <field name="sequence">10</field>
- <field name="type">normal_recurring</field>
- </record>
-
- <record model="ir.actions.act_window" id="crm_case_stage_form_installer">
- <field name="name">Review Sales Stages</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">crm.case.stage</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="view_id" ref="crm.crm_case_stage_form"/>
- </record>
-
- <record id="crm_case_stage_installer_todo" model="ir.actions.todo">
- <field name="action_id" ref="crm_case_stage_form_installer"/>
- <field name="sequence">10</field>
- <field name="type">normal_recurring</field>
- </record>
-
+<<<<<<< TREE
+
+ <record model="ir.actions.act_window" id="crm_case_section_view_form_installer">
+ <field name="name">Create sales team</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">crm.case.section</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="view_id" ref="crm.crm_case_section_view_form"/>
+ </record>
+
+ <record id="crm_case_section_installer_todo" model="ir.actions.todo">
+ <field name="action_id" ref="crm_case_section_view_form_installer"/>
+ <field name="sequence">10</field>
+ <field name="type">normal_recurring</field>
+ </record>
+
+ <record model="ir.actions.act_window" id="crm_case_stage_form_installer">
+ <field name="name">Review Sales Stages</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">crm.case.stage</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="view_id" ref="crm.crm_case_stage_form"/>
+ </record>
+
+ <record id="crm_case_stage_installer_todo" model="ir.actions.todo">
+ <field name="action_id" ref="crm_case_stage_form_installer"/>
+ <field name="sequence">10</field>
+ <field name="type">normal_recurring</field>
+ </record>
+
+=======
+
+ <record model="ir.actions.act_window" id="crm_case_section_view_form_installer">
+ <field name="name">Create sales team</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">crm.case.section</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="view_id" ref="crm.crm_case_section_view_form"/>
+ </record>
+
+ <record id="crm_case_section_installer_todo" model="ir.actions.todo">
+ <field name="action_id" ref="crm_case_section_view_form_installer"/>
+ <field name="target">current</field>
+ <field name="sequence">10</field>
+ <field name="type">normal_recurring</field>
+ <field name="state">skip</field>
+ </record>
+
+ <record model="ir.actions.act_window" id="crm_case_stage_form_installer">
+ <field name="name">Review Sales Stages</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">crm.case.stage</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="view_id" ref="crm.crm_case_stage_form"/>
+ </record>
+
+ <record id="crm_case_stage_installer_todo" model="ir.actions.todo">
+ <field name="action_id" ref="crm_case_stage_form_installer"/>
+ <field name="sequence">10</field>
+ <field name="target">current</field>
+ <field name="type">normal_recurring</field>
+ <field name="state">skip</field>
+ </record>
+-->
+>>>>>>> MERGE-SOURCE
</data>
</openerp>
=== modified file 'crm/i18n/ru.po'
--- crm/i18n/ru.po 2011-04-26 04:41:54 +0000
+++ crm/i18n/ru.po 2011-04-27 05:38:07 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-25 08:48+0000\n"
"Last-Translator: Stanislav Hanzhin <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-04-15 19:44+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-26 04:41+0000\n"
"X-Generator: Launchpad (build 12758)\n"
+=======
+"X-Launchpad-Export-Date: 2011-04-16 04:58+0000\n"
+"X-Generator: Launchpad (build 12735)\n"
+>>>>>>> MERGE-SOURCE
#. module: crm
#: view:crm.lead.report:0
=== modified file 'hr/hr_installer.xml'
--- hr/hr_installer.xml 2011-04-14 11:30:49 +0000
+++ hr/hr_installer.xml 2011-04-27 05:38:07 +0000
@@ -4,12 +4,12 @@
<record id="view_hr_installer" model="ir.ui.view">
<field name="name">hr.installer.view</field>
- <field name="model">hr.installer</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">
+ <!-- form position="attributes">
<attribute name="string">Human Resources Application Configuration</attribute>
</form>
<separator string="title" position="attributes">
@@ -31,14 +31,33 @@
<field name="hr_evaluation" groups="base.group_extended"/>
<field name="hr_payroll" groups="base.group_extended"/>
<field name="hr_payroll_account" groups="base.group_extended"/>
- </group>
+ </group
<xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">Configure</attribute>
</xpath>
+ -->
+ <xpath expr="//field[@name='hr']" position="after">
+ <group attrs="{'invisible':[('hr','=',False)]}" >
+ </group>
+ <group attrs="{'invisible':[('hr','=',False)]}" >
+ <separator string="HR Applications" colspan="4"/>
+ <field name="hr_holidays"/>
+ <field name="hr_expense"/>
+ <field name="hr_recruitment"/>
+ <field name="hr_timesheet_sheet"/>
+ <field name="hr_contract"/>
+ <field name="hr_attendance"/>
+ <field name="hr_evaluation" groups="base.group_extended"/>
+ <field name="hr_payroll" groups="base.group_extended"/>
+ <field name="hr_payroll_account" groups="base.group_extended"/>
+ </group>
+ </xpath>
+
</data>
</field>
</record>
-
+
+<!--
<record id="action_hr_installer" model="ir.actions.act_window">
<field name="name">Human Resources Application Configuration</field>
<field name="type">ir.actions.act_window</field>
@@ -55,21 +74,41 @@
<field name="type">special</field>
</record>
- <record model="ir.actions.act_window" id="view_employee_form_installer">
- <field name="name">Create Your Employees</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">hr.employee</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="view_id" ref="hr.view_employee_form"/>
- </record>
-
- <record id="view_employee_form_todo" model="ir.actions.todo">
- <field name="action_id" ref="view_employee_form_installer"/>
- <field name="sequence">3</field>
- <field name="type">normal_recurring</field>
- </record>
-
-
+<<<<<<< TREE
+ <record model="ir.actions.act_window" id="view_employee_form_installer">
+ <field name="name">Create Your Employees</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">hr.employee</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="view_id" ref="hr.view_employee_form"/>
+ </record>
+
+ <record id="view_employee_form_todo" model="ir.actions.todo">
+ <field name="action_id" ref="view_employee_form_installer"/>
+ <field name="sequence">3</field>
+ <field name="type">normal_recurring</field>
+ </record>
+
+
+=======
+ <record model="ir.actions.act_window" id="view_employee_form_installer">
+ <field name="name">Create Your Employees</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">hr.employee</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="view_id" ref="hr.view_employee_form"/>
+ </record>
+
+ <record id="view_employee_form_todo" model="ir.actions.todo">
+ <field name="action_id" ref="view_employee_form_installer"/>
+ <field name="sequence">3</field>
+ <field name="target">current</field>
+ <field name="type">normal_recurring</field>
+ <field name="state">skip</field>
+ </record>
+ -->
+>>>>>>> MERGE-SOURCE
</data>
</openerp>
=== modified file 'hr/installer.py'
--- hr/installer.py 2011-01-14 00:11:01 +0000
+++ hr/installer.py 2011-04-27 05:38:07 +0000
@@ -21,8 +21,7 @@
from osv import fields, osv
class hr_installer(osv.osv_memory):
- _name = 'hr.installer'
- _inherit = 'res.config.installer'
+ _inherit = 'base.setup.installer'
_columns = {
# Human Resources Management
'hr_holidays': fields.boolean('Holidays / Leaves Management',
=== modified file 'hr_holidays/hr_holidays_view.xml'
=== modified file 'project/installer.py'
--- project/installer.py 2011-01-14 00:11:01 +0000
+++ project/installer.py 2011-04-27 05:38:07 +0000
@@ -22,8 +22,8 @@
from osv import fields, osv
class project_installer(osv.osv_memory):
- _name = 'project.installer'
- _inherit = 'res.config.installer'
+
+ _inherit = 'base.setup.installer'
_columns = {
# Project Management
=== modified file 'project/project_installer.xml'
--- project/project_installer.xml 2011-04-08 12:28:11 +0000
+++ project/project_installer.xml 2011-04-27 05:38:07 +0000
@@ -3,11 +3,12 @@
<record id="view_project_installer" model="ir.ui.view">
<field name="name">project.installer.view</field>
- <field name="model">project.installer</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">Project Application Configuration</attribute>
</form>
@@ -34,10 +35,29 @@
<field name="project_scrum"/>
<field name="project_gtd"/>
</group>
+ -->
+ <xpath expr="//field[@name='project']" position="after">
+ <group attrs="{'invisible':[('project','=',False)]}" >
+ </group>
+ <group attrs="{'invisible':[('project','=',False)]}" >
+ <separator string="Project Management Application" colspan="4"/>
+ <field name="project_issue"/>
+ <field name="project_long_term" groups="base.group_extended"/>
+ <field name="hr_timesheet_sheet"/>
+ <field name="project_timesheet"/>
+ <field name="account_budget" groups="base.group_extended"/>
+ <newline/>
+ <separator string="Methodologies" colspan="4"/>
+ <field name="project_scrum"/>
+ <field name="project_gtd"/>
+ </group>
+ </xpath>
+
</data>
</field>
</record>
+<!--
<record id="action_project_installer" model="ir.actions.act_window">
<field name="name">Project Application Configuration</field>
<field name="type">ir.actions.act_window</field>
@@ -53,6 +73,6 @@
<field name="type">special</field>
<field name="sequence">3</field>
</record>
-
+ -->
</data>
</openerp>
Follow ups
