Jagdish Panchal (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-settings-wizards-improvements-jap into
lp:~openerp-dev/openobject-addons/trunk-setting-configuration-improvements.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-settings-wizards-improvements-jap/+merge/103852
Hello,
Improve usability of configuration wizards in
sale,warehouse,purchase,account,project,hr application as specified in
Applications settings wizards part 2 pad.
Thanks,
JAP
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-settings-wizards-improvements-jap/+merge/103852
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-settings-wizards-improvements-jap into
lp:~openerp-dev/openobject-addons/trunk-setting-configuration-improvements.
=== modified file 'hr/res_config.py'
--- hr/res_config.py 2012-04-10 11:52:19 +0000
+++ hr/res_config.py 2012-04-27 11:31:38 +0000
@@ -26,18 +26,23 @@
_inherit = 'res.config.settings'
_columns = {
- 'module_hr_timesheet_sheet': fields.boolean('Manage Timesheets and Attendances',
+ 'module_hr_timesheet_sheet': fields.boolean('Timesheet Validation by Manager',
help ="""This installs the module hr_timesheet_sheet."""),
- 'module_hr_holidays': fields.boolean('Manage Holidays',
+ 'module_hr_attendance': fields.boolean('Track Attendances',
+ help ="""This installs the module hr_attendance."""),
+ 'module_hr_timesheet': fields.boolean('Manage Timesheets',
+ help ="""This installs the module hr_timesheet."""),
+ 'module_hr_holidays': fields.boolean('Leaves & Holidays',
help ="""This installs the module hr_holidays."""),
- 'module_hr_expense': fields.boolean('Manage Employees Expenses',
+ 'module_hr_expense': fields.boolean('Expenses',
help ="""This installs the module hr_expense."""),
- 'module_hr_recruitment': fields.boolean('Manage Recruitment Process',
+ 'module_hr_recruitment': fields.boolean('Recruitment',
help ="""This installs the module hr_recruitment."""),
- 'module_hr_contract': fields.boolean('Manage Employees Contracts',
+ 'module_hr_contract': fields.boolean('Employees Contracts',
help ="""This installs the module hr_contract."""),
- 'module_hr_evaluation': fields.boolean('Manage Appraisals Process',
+ 'module_hr_evaluation': fields.boolean('Periodic Appraisals',
help ="""This installs the module hr_evaluation."""),
+
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'hr/res_config_view.xml'
--- hr/res_config_view.xml 2012-04-18 13:29:52 +0000
+++ hr/res_config_view.xml 2012-04-27 11:31:38 +0000
@@ -19,23 +19,18 @@
<button string="Cancel" special="cancel"/>
</div>
<sheet layout="auto">
- <separator string="Human Resources" colspan="4"/>
- <field name="module_hr_timesheet_sheet"/>
- <newline/>
- <field name="module_hr_holidays"/>
-
<separator string="Additional Features" colspan="4"/>
<field name="module_hr_expense"/>
- <newline/>
<field name="module_hr_recruitment"/>
- <newline/>
<field name="module_hr_evaluation"/>
- <newline/>
<field name="module_hr_contract"/>
-
- <group name="config_timesheets" colspan="4"/>
- <group name="config_payroll" colspan="4"/>
- <group name="config_recruitment" colspan="4"/>
+ <field name="module_hr_holidays"/>
+ <group name="config_timesheets" colspan="2"/>
+ <separator string="Timesheets" colspan="4"/>
+ <field name="module_hr_attendance"/>
+ <field name="module_hr_timesheet"/>
+ <field name="module_hr_timesheet_sheet"/>
+ <group name="config_recruitment" colspan="2"/>
</sheet>
</form>
</field>
=== modified file 'hr_holidays/hr_holidays_data.xml'
--- hr_holidays/hr_holidays_data.xml 2011-12-07 06:18:40 +0000
+++ hr_holidays/hr_holidays_data.xml 2012-04-27 11:31:38 +0000
@@ -4,7 +4,7 @@
<!-- Casual leave -->
<record model="hr.holidays.status" id="holiday_status_cl">
- <field name="name">Legal Leaves</field>
+ <field eval="'Legal Leaves '+time.strftime('%Y')" name="name"/>
<field name="color_name">black</field>
</record>
=== modified file 'hr_payroll/res_config_view.xml'
--- hr_payroll/res_config_view.xml 2012-04-10 11:52:19 +0000
+++ hr_payroll/res_config_view.xml 2012-04-27 11:31:38 +0000
@@ -7,10 +7,9 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_human_resources_configuration"/>
<field name="arch" type="xml">
- <group name="config_payroll" position="after">
- <separator string="Account Payroll" colspan="4"/>
+ <field name="module_hr_holidays" position="after">
<field name="module_hr_payroll_account"/>
- </group>
+ </field>
</field>
</record>
</data>
=== modified file 'hr_recruitment/res_config.py'
--- hr_recruitment/res_config.py 2012-04-24 09:51:40 +0000
+++ hr_recruitment/res_config.py 2012-04-27 11:31:38 +0000
@@ -26,7 +26,7 @@
_inherit = ['hr.config.settings', 'fetchmail.config.settings']
_columns = {
- 'module_document_ftp': fields.boolean('Index & Track Documents',
+ 'module_document_ftp': fields.boolean('Automatic Indexation of Resumes',
help="""Manage your CV's and motivation letter related to all applicants.
This installs the module document_ftp."""),
'fetchmail_applicants': fields.boolean('Create Applicants from Incoming Mails', readonly=True,
=== modified file 'hr_timesheet_sheet/res_config.py'
--- hr_timesheet_sheet/res_config.py 2012-04-10 11:52:19 +0000
+++ hr_timesheet_sheet/res_config.py 2012-04-27 11:31:38 +0000
@@ -26,7 +26,7 @@
_columns = {
'timesheet_range': fields.selection([('day','Day'),('week','Week'),('month','Month')],
- 'Timesheet Range', help="Periodicity on which you validate your timesheets."),
+ 'Validate Timesheets Every', help="Periodicity on which you validate your timesheets."),
'timesheet_max_difference': fields.float('Timesheet Allowed Difference (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."""),
=== modified file 'hr_timesheet_sheet/res_config_view.xml'
--- hr_timesheet_sheet/res_config_view.xml 2012-04-10 14:09:55 +0000
+++ hr_timesheet_sheet/res_config_view.xml 2012-04-27 11:31:38 +0000
@@ -7,11 +7,11 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_human_resources_configuration"/>
<field name="arch" type="xml">
- <group name="config_timesheets" position="after">
- <separator string="Timesheets" colspan="4"/>
- <field name="timesheet_range"/>
- <field name="timesheet_max_difference"/>
- </group>
+ <field name="module_hr_timesheet_sheet" position="after">
+ <newline/>
+ <field name="timesheet_range" attrs="{'invisible':[('module_hr_timesheet_sheet','=',False)],'required': [('module_hr_timesheet_sheet','=',True)]}"/>
+ <field name="timesheet_max_difference" attrs="{'invisible':[('module_hr_timesheet_sheet','=',False)],'required': [('module_hr_timesheet_sheet','=',True)]}"/>
+ </field>
</field>
</record>
</data>
=== modified file 'mrp/res_config.py'
--- mrp/res_config.py 2012-04-04 13:47:31 +0000
+++ mrp/res_config.py 2012-04-27 11:31:38 +0000
@@ -44,24 +44,30 @@
'module_mrp_operations': fields.boolean("Track Dates in Work Order Operations",
help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab).
This installs the module mrp_operations."""),
- 'module_mrp_subproduct': fields.boolean("Produce Different Products from one Production",
+ 'module_mrp_subproduct': fields.boolean("Produce Several Product from One Production",
help="""You can configure sub-products in the bill of material.
Without this module: A + B + C -> D.
With this module: A + B + C -> D + E.
This installs the module mrp_subproduct."""),
- 'module_mrp_jit': fields.boolean("Just in Time Scheduling",
+ 'module_mrp_jit': fields.boolean("Real-Time Scheduling",
help="""This allows Just In Time computation of procurement orders.
All procurement orders will be processed immediately, which could in some
cases entail a small performance impact.
This installs the module mrp_jit."""),
+ 'module_stock_no_autopicking': fields.boolean("Manual Picking to Fulfill Manufacturing Orders",
+ help="""This module allows an intermediate picking process to provide raw materials to production orders.
+ For example to manage production made by your suppliers (sub-contracting).
+ To achieve this, set the assembled product which is sub-contracted to "No Auto-Picking"
+ and put the location of the supplier in the routing of the assembly operation.
+ This installs the module stock_no_autopicking."""),
'group_mrp_routings': fields.boolean("Manage Routings and Work Orders",
implied_group='mrp.group_mrp_routings',
help="""Routings allow you to create and manage the manufacturing operations that should be followed
within your work centers in order to produce a product. They are attached to bills of materials
that will define the required raw materials."""),
- 'group_mrp_properties': fields.boolean("Manage Properties",
+ 'group_mrp_properties': fields.boolean("Allow Several BoMs per Product",
implied_group='product.group_mrp_properties',
- help="""Allows to define specific property that can be assigned to your bill of materials."""),
+ help="""The selection of the right Bill of Material to use will depend on the properties specified on the sale order and the Bill of Material."""),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'mrp/res_config_view.xml'
--- mrp/res_config_view.xml 2012-04-18 13:29:52 +0000
+++ mrp/res_config_view.xml 2012-04-27 11:31:38 +0000
@@ -17,10 +17,9 @@
<field name="module_stock_planning"/>
<field name="module_mrp_subproduct"/>
<field name="module_mrp_repair"/>
-
<separator string="Logistics" colspan="4"/>
<field name="module_mrp_jit"/>
-
+ <field name="module_stock_no_autopicking"/>
<separator string="Bill Of Material" colspan="4"/>
<field name="group_mrp_routings"/>
<field name="group_mrp_properties"/>
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2012-04-25 14:02:12 +0000
+++ project/project_view.xml 2012-04-27 11:31:38 +0000
@@ -239,10 +239,10 @@
<group colspan="6" col="6">
<field name="name" select="1"/>
<field name="project_id" select="1" on_change="onchange_project(project_id)"/>
- <field name="total_hours" widget="float_time"/>
+ <field name="total_hours" widget="float_time" groups="project.group_tasks_work_on_tasks"/>
<field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
<field name="user_id" select="1" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
- <field name="progress" widget="progressbar"/>
+ <field name="progress" widget="progressbar" groups="project.group_tasks_work_on_tasks"/>
</group>
<notebook colspan="4">
<page string="Information">
@@ -251,18 +251,19 @@
name="planned_hours"
widget="float_time"
attrs="{'readonly':[('state','!=','draft')]}"
+ groups="project.group_time_work_estimation_tasks"
on_change="onchange_planned(planned_hours, effective_hours)"/>
<field
name="effective_hours"
- widget="float_time" invisible="1"/>
+ widget="float_time" invisible="1" groups="project.group_tasks_work_on_tasks"/>
</group>
<group col="3" colspan="2">
- <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/>
+ <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2" groups="project.group_time_work_estimation_tasks"/>
<button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
</group>
<field colspan="4" name="description" nolabel="1" attrs="{'readonly':[('state','=','done')]}"/>
- <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['done','draft'])]}">
+ <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['done','draft'])]}" groups="project.group_tasks_work_on_tasks">
<tree string="Task Work" editable="top">
<field name="name" />
<field name="hours" widget="float_time" sum="Spent Hours"/>
@@ -332,7 +333,7 @@
<field name="sequence"/>
<field name="state"/>
<field name="kanban_state"/>
- <field name="remaining_hours" sum="Remaining Time"/>
+ <field name="remaining_hours" sum="Remaining Time" groups="project.group_time_work_estimation_tasks"/>
<field name="date_deadline"/>
<templates>
<t t-name="task_details">
@@ -422,9 +423,9 @@
<field name="user_id" invisible="context.get('user_invisible', False)"/>
<field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
<field name="total_hours" invisible="1"/>
- <field name="planned_hours" invisible="context.get('set_visible',False)"/>
+ <field name="planned_hours" invisible="context.get('set_visible',False)" groups="project.group_time_work_estimation_tasks"/>
<field name="effective_hours" widget="float_time" sum="Spent Hours" invisible="1"/>
- <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)" invisible="context.get('set_visible',False)"/>
+ <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)" invisible="context.get('set_visible',False)" groups="project.group_time_work_estimation_tasks"/>
<field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
<field name="type_id" invisible="context.get('set_visible',False)"/>
<button name="next_type" invisible="context.get('set_visible',False)"
=== modified file 'project/res_config.py'
--- project/res_config.py 2012-04-04 14:02:32 +0000
+++ project/res_config.py 2012-04-27 11:31:38 +0000
@@ -35,7 +35,7 @@
help="""Lets the company customize which Pad installation should be used to link to new pads
(by default, http://ietherpad.com/).
This installs the module pad."""),
- 'module_project_timesheet': fields.boolean("Timesheets and Invoices",
+ 'module_project_timesheet': fields.boolean("Timesheets per Task",
help="""This allows you to transfer the entries under tasks defined for Project Management to
the timesheet line entries for particular date and user, with the effect of creating,
editing and deleting either ways.
@@ -49,6 +49,12 @@
'module_project_issue_sheet': fields.boolean("Track and invoice issues working time",
help="""Provides timesheet support for the issues/bugs management in project.
This installs the module project_issue_sheet."""),
+ 'group_tasks_work_on_tasks': fields.boolean("Task's Work on Tasks",
+ implied_group='project.group_tasks_work_on_tasks',
+ help="Allows you to compute work on tasks."),
+ 'group_time_work_estimation_tasks': fields.boolean("Time Estimation on Tasks",
+ implied_group='project.group_time_work_estimation_tasks',
+ help="Allows you to compute Time Estimation on tasks."),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'project/res_config_view.xml'
--- project/res_config_view.xml 2012-04-18 13:29:52 +0000
+++ project/res_config_view.xml 2012-04-27 11:31:38 +0000
@@ -17,6 +17,8 @@
<field name="module_project_mrp"/>
<field name="module_project_timesheet"/>
<field name="module_pad"/>
+ <field name="group_tasks_work_on_tasks"/>
+ <field name="group_time_work_estimation_tasks"/>
<separator string="Planning" colspan="4"/>
<field name="module_project_long_term"/>
=== modified file 'project/security/project_security.xml'
--- project/security/project_security.xml 2012-04-04 09:08:30 +0000
+++ project/security/project_security.xml 2012-04-27 11:31:38 +0000
@@ -18,6 +18,17 @@
<field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
</record>
+ <record id="group_tasks_work_on_tasks" model="res.groups">
+ <field name="name">Task's Work on Tasks</field>
+ <field name="category_id" ref="base.module_category_hidden"/>
+ </record>
+
+ <record id="group_time_work_estimation_tasks" model="res.groups">
+ <field name="name">Time Estimation on Tasks</field>
+ <field name="implied_ids" eval="[(4, ref('group_tasks_work_on_tasks'))]"/>
+ <field name="category_id" ref="base.module_category_hidden"/>
+ </record>
+
<record model="ir.rule" id="project_comp_rule">
<field name="name">Project multi-company</field>
<field name="model_id" ref="model_project_project"/>
=== modified file 'stock/res_config.py'
--- stock/res_config.py 2012-04-26 09:18:17 +0000
+++ stock/res_config.py 2012-04-27 11:31:38 +0000
@@ -26,12 +26,6 @@
_inherit = 'res.config.settings'
_columns = {
- 'module_stock_no_autopicking': fields.boolean("Force Picking before Manufactoring Orders",
- help="""This module allows an intermediate picking process to provide raw materials to production orders.
- For example to manage production made by your suppliers (sub-contracting).
- To achieve this, set the assembled product which is sub-contracted to "No Auto-Picking"
- and put the location of the supplier in the routing of the assembly operation.
- This installs the module stock_no_autopicking."""),
'module_claim_from_delivery': fields.boolean("Track Claims from Delivery",
help="""Adds a Claim link to the delivery order.
This installs the module claim_from_delivery."""),
=== modified file 'stock/res_config_view.xml'
--- stock/res_config_view.xml 2012-04-27 06:54:37 +0000
+++ stock/res_config_view.xml 2012-04-27 11:31:38 +0000
@@ -22,7 +22,6 @@
<separator string="Logistics" colspan="4"/>
<field name="group_stock_multiple_locations"/>
- <field name="module_stock_no_autopicking"/>
<field name="module_stock_location"/>
<field name="module_stock_invoice_directly"/>
_______________________________________________
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
