Sanjay Gohel (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-config-wizard-apa-imp-sgo into
lp:~openerp-dev/openobject-addons/trunk-config-wizard-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-config-wizard-apa-imp-sgo/+merge/117422
Hello sir,
I have improve hr view as per suggetion and also improve string of field
which are required.
Thank You.
Sanjay Gohel.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-config-wizard-apa-imp-sgo/+merge/117422
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-config-wizard-apa.
=== modified file 'hr/res_config.py'
--- hr/res_config.py 2012-06-25 09:41:20 +0000
+++ hr/res_config.py 2012-07-31 12:35:26 +0000
@@ -26,23 +26,23 @@
_inherit = 'res.config.settings'
_columns = {
- 'module_hr_timesheet_sheet': fields.boolean('Timesheet Validation by Manager',
+ 'module_hr_timesheet_sheet': fields.boolean('allow timesheets validation by managers',
help ="""This installs the module hr_timesheet_sheet."""),
- 'module_hr_attendance': fields.boolean('Track Attendances',
+ 'module_hr_attendance': fields.boolean('track attendances',
help ="""This installs the module hr_attendance."""),
- 'module_hr_timesheet': fields.boolean('Manage Timesheets',
+ 'module_hr_timesheet': fields.boolean('manage timesheets',
help ="""This installs the module hr_timesheet."""),
- 'module_hr_holidays': fields.boolean('Leaves & Holidays',
+ 'module_hr_holidays': fields.boolean('manage leaves and allocation requests',
help ="""This installs the module hr_holidays."""),
- 'module_hr_expense': fields.boolean('Expenses',
+ 'module_hr_expense': fields.boolean('manage employees expenses',
help ="""This installs the module hr_expense."""),
- 'module_hr_recruitment': fields.boolean('Recruitment',
+ 'module_hr_recruitment': fields.boolean('manage the recruitment pipe',
help ="""This installs the module hr_recruitment."""),
- 'module_hr_contract': fields.boolean('Employees Contracts',
+ 'module_hr_contract': fields.boolean('manage contract per employee',
help ="""This installs the module hr_contract."""),
- 'module_hr_evaluation': fields.boolean('Periodic Appraisals',
+ 'module_hr_evaluation': fields.boolean('manage employees periodic evaluation',
help ="""This installs the module hr_evaluation."""),
- 'module_hr_payroll': fields.boolean('Payroll',
+ 'module_hr_payroll': fields.boolean('manage payroll',
help ="""This installs the module hr_payroll."""),
}
=== modified file 'hr/res_config_view.xml'
--- hr/res_config_view.xml 2012-07-31 06:59:16 +0000
+++ hr/res_config_view.xml 2012-07-31 12:35:26 +0000
@@ -40,15 +40,11 @@
<field name="module_hr_contract" class="oe_inline"/>
<label for="module_hr_contract"/>
</div>
- <div>
- <field name="module_hr_recruitment" class="oe_inline"/>
- <label for="module_hr_recruitment"/>
- </div>
<div name="hr_payroll">
<field name="module_hr_payroll" class="oe_inline"/>
<label for="module_hr_payroll"/>
<button name="%(open_payroll_modules)d" type="action"
- string="Install Country-Specific Payroll" icon="gtk-go-forward"
+ string="install your country's payroll" icon="gtk-go-forward"
attrs="{'invisible': [('module_hr_payroll','=',False)]}" class="oe_link"/>
</div>
</div>
@@ -70,6 +66,15 @@
</div>
</div>
</group>
+ <group name="recruitment_grp">
+ <label for="id" string="Recruitment"/>
+ <div name="recruitment">
+ <div>
+ <field name="module_hr_recruitment" class="oe_inline"/>
+ <label for="module_hr_recruitment"/>
+ </div>
+ </div>
+ </group>
</form>
</field>
</record>
=== modified file 'hr_payroll/res_config.py'
--- hr_payroll/res_config.py 2012-05-30 13:46:13 +0000
+++ hr_payroll/res_config.py 2012-07-31 12:35:26 +0000
@@ -24,6 +24,6 @@
class human_resources_configuration(osv.osv_memory):
_inherit = 'hr.config.settings'
_columns = {
- 'module_hr_payroll_account': fields.boolean('Manage Account Payroll',
+ 'module_hr_payroll_account': fields.boolean('link your payroll to accounting system',
help ="""Create Journal Entries from Payslips"""),
}
=== modified file 'hr_recruitment/res_config.py'
--- hr_recruitment/res_config.py 2012-06-09 17:27:57 +0000
+++ hr_recruitment/res_config.py 2012-07-31 12:35:26 +0000
@@ -26,10 +26,10 @@
_inherit = ['hr.config.settings', 'fetchmail.config.settings']
_columns = {
- 'module_document_ftp': fields.boolean('Automatic Indexation of Resumes',
+ 'module_document_ftp': fields.boolean('allow the automatic indexation of resumes',
help="""Manage your CV's and motivation letter related to all applicants.
This installs the module document_ftp. This will install the knowledge management module in order to allow you to search using specific keywords through the content of all documents (PDF, .DOCx...)"""),
- 'fetchmail_applicants': fields.boolean('Create Applicants from Incoming Mails',
+ 'fetchmail_applicants': fields.boolean('create applicants from an incoming email account',
fetchmail_model='hr.applicant', fetchmail_name='Incoming HR Applications',
help ="""Allow applicants to send their job application to an email address ([email protected]),
and create automatically application documents in the system."""),
=== modified file 'hr_recruitment/res_config_view.xml'
--- hr_recruitment/res_config_view.xml 2012-07-30 11:25:27 +0000
+++ hr_recruitment/res_config_view.xml 2012-07-31 12:35:26 +0000
@@ -7,23 +7,18 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_human_resources_configuration"/>
<field name="arch" type="xml">
- <group name="timesheet_grp" position="after">
- <group>
- <label for="id" string="Recruitment"/>
- <div>
- <div>
- <field name="module_document_ftp" class="oe_inline"/>
- <label for="module_document_ftp"/>
- </div>
- <div>
- <field name="fetchmail_applicants" class="oe_inline"/>
- <label for="fetchmail_applicants"/>
- <button name="configure_fetchmail_applicants" type="object" string="Configure" icon="gtk-go-forward"
- attrs="{'invisible': [('fetchmail_applicants','=',False)]}" class="oe_link"/>
- </div>
- </div>
- </group>
- </group>
+ <div name="recruitment" position="inside">
+ <div>
+ <field name="fetchmail_applicants" class="oe_inline"/>
+ <label for="fetchmail_applicants"/>
+ <button name="configure_fetchmail_applicants" type="object" string="configure" icon="gtk-go-forward"
+ attrs="{'invisible': [('fetchmail_applicants','=',False)]}" class="oe_link"/>
+ </div>
+ <div>
+ <field name="module_document_ftp" class="oe_inline"/>
+ <label for="module_document_ftp"/>
+ </div>
+ </div>
</field>
</record>
</data>
=== modified file 'hr_timesheet_sheet/res_config.py'
--- hr_timesheet_sheet/res_config.py 2012-04-27 10:43:59 +0000
+++ hr_timesheet_sheet/res_config.py 2012-07-31 12:35:26 +0000
@@ -26,8 +26,8 @@
_columns = {
'timesheet_range': fields.selection([('day','Day'),('week','Week'),('month','Month')],
- 'Validate Timesheets Every', help="Periodicity on which you validate your timesheets."),
- 'timesheet_max_difference': fields.float('Timesheet Allowed Difference (Hours)',
+ 'Validate timesheets every', help="Periodicity on which you validate your timesheets."),
+ 'timesheet_max_difference': fields.float('allow a difference of time between timesheets and attendances of (Hours)',
help="""Allowed difference in hours between the sign in/out and the timesheet
computation for one sheet. Set this to 0 if you do not want any control."""),
}
_______________________________________________
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
