Mayur Maheshwari(OpenErp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-configuration-rework-mis-mma 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-mis-mma/+merge/64279
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-rework-mis-mma/+merge/64279
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-configuration-rework.
=== modified file 'account_followup/account_followup_view.xml'
--- account_followup/account_followup_view.xml 2011-06-10 09:35:16 +0000
+++ account_followup/account_followup_view.xml 2011-06-11 06:15:55 +0000
@@ -25,7 +25,7 @@
<field name="delay" />
<field name="start" groups="base.group_extended"/>
<newline/>
- <separator string="" colspan="4"/>
+ <separator string="Message" colspan="4"/>
<field colspan="4" name="description" nolabel="1"/>
<separator string="Legend" colspan="4"/>
<label string="%%(partner_name)s: Partner Name" colspan="2"/>
=== modified file 'base_setup/installer.py'
--- base_setup/installer.py 2011-06-10 11:11:25 +0000
+++ base_setup/installer.py 2011-06-11 06:15:55 +0000
@@ -212,7 +212,7 @@
"translations are available. If you want to Add new Language, you can add it from 'Load an Official Translation' wizard from 'Administration' menu."),
'view': fields.selection([('simple','Simplified'),
('extended','Extended')],
- 'Interface', required=True, help= "If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences." ),
+ 'Interface', required=True, help= "If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the define default users preferences." ),
'menu_tips': fields.boolean('Display Tips', help="Check out this box if you want to always display tips on each menu action"),
}
=== modified file 'base_setup/wizard/res_company_logo.py'
--- base_setup/wizard/res_company_logo.py 2011-05-09 12:55:22 +0000
+++ base_setup/wizard/res_company_logo.py 2011-06-11 06:15:55 +0000
@@ -27,6 +27,7 @@
class res_company_logo(osv.osv_memory):
_name = 'res.company.logo'
+ _inherit = 'res.config'
_columns = {
'logo' : fields.binary('Logo'),
}
=== modified file 'base_setup/wizard/res_company_logo_view.xml'
--- base_setup/wizard/res_company_logo_view.xml 2011-05-06 08:40:25 +0000
+++ base_setup/wizard/res_company_logo_view.xml 2011-06-11 06:15:55 +0000
@@ -6,17 +6,32 @@
<field name="name">res.company.logo.form</field>
<field name="model">res.company.logo</field>
<field name="type">form</field>
+ <field name="inherit_id" ref="base.res_config_view_base"/>
<field name="arch" type="xml">
- <form string="Upload Your Company Logo">
- <separator string="Upload your company logo in JPG or PNG with a format similar to 450*150 pixels" colspan="4"/>
- <field colspan="4" height="150" name="logo" widget="image" nolabel="1"/>
- <separator colspan="4"/>
- <group colspan="4" col="6">
- <label string="" colspan="2"/>
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
- <button icon="gtk-ok" string="Upload" name="execute" type="object"/>
- </group>
+ <data>
+ <form position="attributes">
+ <attribute name="string">Upload Your Company Logo</attribute>
</form>
+ <xpath expr='//separator[@string="title"]' position='attributes'>
+ <attribute name='string'> </attribute>
+ </xpath>
+ <xpath expr="//label[@string='description']"
+ position="attributes">
+ <attribute name="string">Upload your company logo in JPG or PNG with a format similar to 450*150 pixels </attribute>
+ </xpath>
+ <xpath expr='//separator[@string="vsep"]' position='attributes'>
+ <attribute name='string'> </attribute>
+ <attribute name='rowspan'>12</attribute>
+ </xpath>
+ <xpath expr="//button[@string='Next']" position="replace">
+ <button icon="gtk-ok" string="Upload" name="execute" type="object"/>
+ </xpath>
+ <group string="res_config_contents" position="replace">
+ <group colspan="4">
+ <field colspan="4" height="150" name="logo" widget="image" nolabel="1"/>
+ </group>
+ </group>
+ </data>
</field>
</record>
=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml 2011-05-30 12:13:07 +0000
+++ hr/hr_view.xml 2011-06-11 06:15:55 +0000
@@ -154,6 +154,23 @@
<field name="search_view_id" ref="view_employee_filter"/>
<field name="help">Here you can manage your work force by creating employees and assigning them specific properties in the system. Maintain all employee related information and keep track of anything that needs to be recorded for them. The personal information tab will help you maintain their identity data. The Categories tab gives you the opportunity to assign them related employee categories depending on their position and activities within the company. A category can be a seniority level within the company or a department. The Timesheets tab allows to assign them a specific timesheet and analytic journal where they will be able to enter time through the system. In the note tab, you can enter text data that should be recorded for a specific employee.</field>
</record>
+
+ <!-- employee configure action -->
+ <record id="action_create_hr_employee_installer" model="ir.actions.act_window">
+ <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">form</field>
+ <field name="view_id" ref="view_employee_form"/>
+ </record>
+
+ <record id="config_wizard_action_create_hr_employee_installer" model="ir.actions.todo">
+ <field name="action_id" ref="action_create_hr_employee_installer"/>
+ <field name="type">normal</field>
+ <field name="target">current</field>
+ <field name="state">skip</field>
+ </record>
<menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
=== modified file 'hr_recruitment/hr_recruitment_installer_view.xml'
--- hr_recruitment/hr_recruitment_installer_view.xml 2011-06-03 13:08:23 +0000
+++ hr_recruitment/hr_recruitment_installer_view.xml 2011-06-11 06:15:55 +0000
@@ -2,12 +2,13 @@
<openerp>
<data>
<record model="ir.actions.act_window" id="hr_recruitment_stage_form_installer">
- <field name="name">Review Recruitment Stages</field>
+ <field name="name">Review Recruitment Stages </field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.recruitment.stage</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
- <field name="view_id" ref="hr_recruitment.hr_recruitment_stage_form"/>
+ <field name="help">Check if the following stages are matching your recruitment process. Don't forget to specify the department if your recruitment process is different according to the job position.</field>
+ <field name="view_id" ref="hr_recruitment.hr_recruitment_stage_tree"/>
</record>
<record id="hr_recruitment_stage_form_todo" model="ir.actions.todo">
_______________________________________________
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
