Hardik Ansodariya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-polish2-project_long-han into
lp:openobject-addons.
Requested reviews:
Amit (Open ERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-polish2-project_long-han/+merge/81810
Hello,
(1)set the menu order of Project/Configuration/Users:
* Users Planning
* Users Leaves
* Working Time
(2)In resource form (Users Planning) :
Hide Resource type field
organized search view filed like this : Name | User | Active
Removed Tab "General Information" from Users Planning form view
(3)Task and Project long term demo data:
set starting date for the task and phasewhich are in "in progress" state
set stage for task
Field phase_id moved to first tab from extra info
(4)Project form view:
member tab, hide Login, Language and last connection columns
create a new project -> go to the link "phases" (project right sidebar) ->
create a new phase from there -> the project field should be set as the project
i come from
both issues are working properly
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-polish2-project_long-han/+merge/81810
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-polish2-project_long-han.
=== modified file 'project/project_demo.xml'
--- project/project_demo.xml 2011-11-08 21:03:38 +0000
+++ project/project_demo.xml 2011-11-10 06:04:18 +0000
@@ -157,7 +157,7 @@
<field name="priority">2</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
<field name="name">Develop Module in Sale Management</field>
- <field name="type_id" ref="project_tt_development"/>
+ <field name="type_id" ref="project_tt_specification"/>
</record>
<record id="project_task_11" model="project.task">
@@ -166,7 +166,7 @@
<field name="priority">2</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
<field name="name">Develop module in Warehouse</field>
- <field name="type_id" ref="project_tt_development"/>
+ <field name="type_id" ref="project_tt_specification"/>
</record>
<record id="project_task_12" model="project.task">
@@ -175,7 +175,7 @@
<field name="priority">2</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
<field name="name">Integrate Modules</field>
- <field name="type_id" ref="project_tt_development"/>
+ <field name="type_id" ref="project_tt_specification"/>
</record>
<record id="project_task_13" model="project.task">
@@ -184,7 +184,7 @@
<field name="priority">2</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
<field name="name">Unit Testing</field>
- <field name="type_id" ref="project_tt_testing"/>
+ <field name="type_id" ref="project_tt_specification"/>
</record>
<record id="project_task_14" model="project.task">
@@ -193,7 +193,7 @@
<field name="priority">2</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
<field name="name">Regression Test</field>
- <field name="type_id" ref="project_tt_testing"/>
+ <field name="type_id" ref="project_tt_specification"/>
</record>
<record id="project_task_15" model="project.task">
@@ -212,7 +212,7 @@
<field name="priority">2</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
<field name="name">Performance Tuning</field>
- <field name="type_id" ref="project_tt_merge"/>
+ <field name="type_id" ref="project_tt_specification"/>
</record>
<record id="project_task_17" model="project.task">
@@ -221,7 +221,7 @@
<field name="priority">2</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
<field name="name">Deploy and Review on Customer System</field>
- <field name="type_id" ref="project_tt_merge"/>
+ <field name="type_id" ref="project_tt_specification"/>
</record>
<record id="project_task_18" model="project.task">
@@ -230,7 +230,7 @@
<field name="priority">2</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
<field name="name">Training and Presentation</field>
- <field name="type_id" ref="project_tt_merge"/>
+ <field name="type_id" ref="project_tt_specification"/>
</record>
<!--
@@ -280,7 +280,7 @@
<record id="project_task_116" model="project.task">
<field name="planned_hours">38.0</field>
<field name="remaining_hours">38.0</field>
- <field name="type_id" ref="project_tt_development"/>
+ <field name="type_id" ref="project_tt_specification"/>
<field name="user_id" ref="base.user_root"/>
<field name="project_id" ref="project_project_22"/>
<field name="description">BoM, After sales returns, interventions. Traceability.</field>
@@ -289,7 +289,7 @@
<record id="project_task_130" model="project.task">
<field name="planned_hours">16.0</field>
<field name="remaining_hours">16.0</field>
- <field name="type_id" ref="project_tt_development"/>
+ <field name="type_id" ref="project_tt_specification"/>
<field model="res.users" name="user_id" search="[('login','=','demo')]"/>
<field name="project_id" ref="project_project_23"/>
<field name="name">Data importation + Doc</field>
@@ -297,7 +297,7 @@
<record id="project_task_131" model="project.task">
<field name="planned_hours">16.0</field>
<field name="remaining_hours">16.0</field>
- <field name="type_id" ref="project_tt_development"/>
+ <field name="type_id" ref="project_tt_specification"/>
<field model="res.users" name="user_id" search="[('login','=','demo')]"/>
<field name="project_id" ref="project_project_23"/>
<field name="name">Modifications asked by the customer.</field>
@@ -305,7 +305,7 @@
<record id="project_task_184" model="project.task">
<field name="planned_hours">16.0</field>
<field name="remaining_hours">16.0</field>
- <field name="type_id" ref="project_tt_development"/>
+ <field name="type_id" ref="project_tt_specification"/>
<field model="res.users" name="user_id" search="[('login','=','demo')]"/>
<field name="priority">0</field>
<field name="project_id" ref="project_project_21"/>
@@ -315,7 +315,7 @@
<field name="sequence">15</field>
<field name="planned_hours">8.0</field>
<field name="remaining_hours">8.0</field>
- <field name="type_id" ref="project_tt_development"/>
+ <field name="type_id" ref="project_tt_specification"/>
<field model="res.users" name="user_id" search="[('login','=','demo')]"/>
<field name="project_id" ref="project_project_21"/>
<field name="name">Internal testing + Software Install</field>
@@ -330,6 +330,7 @@
<field name="state">open</field>
<field name="project_id" ref="project_project_21"/>
<field name="name">Analysis, Data Importation</field>
+ <field eval="time.strftime('%Y-%m-%d')" name="date_start"/>
</record>
<record id="project_task_189" model="project.task">
<field name="sequence">20</field>
@@ -340,6 +341,7 @@
<field name="project_id" ref="project_project_23"/>
<field name="name">Parameters</field>
<field name="type_id" ref="project_tt_specification"/>
+ <field eval="time.strftime('%Y-%m-%d')" name="date_start"/>
</record>
<record id="project_task_190" model="project.task">
<field name="sequence">20</field>
@@ -349,7 +351,8 @@
<field name="state">open</field>
<field name="project_id" ref="project_project_21"/>
<field name="name">Start of the doc redaction + MRP</field>
- <field name="type_id" ref="project_tt_specification"/>
+ <field eval="time.strftime('%Y-%m-%d')" name="date_start"/>
+ <field name="type_id" ref="project_tt_testing"/>
</record>
</data>
</openerp>
=== modified file 'project_long_term/project_long_term_demo.xml'
--- project_long_term/project_long_term_demo.xml 2011-10-25 23:31:41 +0000
+++ project_long_term/project_long_term_demo.xml 2011-11-10 06:04:18 +0000
@@ -6,6 +6,7 @@
-->
<!-- Project Phases -->
+
<record id="project_phase_1" model="project.phase">
<field eval="[(6, 0, [])]" name="previous_phase_ids"/>
<field name="name">Collect Requirement and Make SRS</field>
@@ -13,8 +14,13 @@
<field eval="1" name="sequence"/>
<field name="duration">30</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
+ <field eval="time.strftime('%Y-%m-%d')" name="date_start"/>
</record>
+ <record id="project_phase_1" model="project.phase">
+ <field name="state">open</field>
+ </record>
+
<record id="project_phase_2" model="project.phase">
<field eval="[(6, 0, [ref('project_phase_1')])]" name="previous_phase_ids"/>
<field name="name">Design Model</field>
@@ -22,6 +28,11 @@
<field eval="2" name="sequence"/>
<field name="duration">20</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
+ <field eval="time.strftime('%Y-%m-%d')" name="date_start"/>
+ </record>
+
+ <record id="project_phase_2" model="project.phase">
+ <field name="state">open</field>
</record>
<record id="project_phase_3" model="project.phase">
@@ -31,8 +42,13 @@
<field eval="3" name="sequence"/>
<field name="duration">20</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
+ <field eval="time.strftime('%Y-%m-%d')" name="date_start"/>
</record>
+ <record id="project_phase_3" model="project.phase">
+ <field name="state">open</field>
+ </record>
+
<record id="project_phase_4" model="project.phase">
<field eval="[(6, 0, [ref('project_phase_2')])]" name="previous_phase_ids"/>
<field name="name">Development and Integration</field>
@@ -40,6 +56,11 @@
<field eval="4" name="sequence"/>
<field name="duration">90</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
+ <field eval="time.strftime('%Y-%m-%d')" name="date_start"/>
+ </record>
+
+ <record id="project_phase_4" model="project.phase">
+ <field name="state">open</field>
</record>
<record id="project_phase_5" model="project.phase">
@@ -49,8 +70,13 @@
<field eval="5" name="sequence"/>
<field name="duration">30</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
+ <field eval="time.strftime('%Y-%m-%d')" name="date_start"/>
</record>
+ <record id="project_phase_5" model="project.phase">
+ <field name="state">open</field>
+ </record>
+
<record id="project_phase_6" model="project.phase">
<field eval="[(6, 0, [ref('project_phase_5')])]" name="previous_phase_ids"/>
<field name="name">Deployement and Training</field>
@@ -58,6 +84,11 @@
<field eval="5" name="sequence"/>
<field name="duration">10</field>
<field name="project_id" ref="project.project_integrate_openerp"/>
+ <field eval="time.strftime('%Y-%m-%d')" name="date_start"/>
+ </record>
+
+ <record id="project_phase_6" model="project.phase">
+ <field name="state">open</field>
</record>
<!-- Tasks -->
=== modified file 'project_long_term/project_long_term_view.xml'
--- project_long_term/project_long_term_view.xml 2011-10-26 00:04:29 +0000
+++ project_long_term/project_long_term_view.xml 2011-11-10 06:04:18 +0000
@@ -300,9 +300,9 @@
<field name="type">form</field>
<field name="inherit_id" ref="project.view_task_form2"/>
<field name="arch" type="xml">
- <field name="sequence" position="after">
+ <xpath expr="//field[@name='effective_hours']" position="after">
<field name="phase_id"/>
- </field>
+ </xpath>
</field>
</record>
<record id="view_phase_task_search_form" model="ir.ui.view">
@@ -324,7 +324,7 @@
<field name="inherit_id" ref="project.view_task_search_form"/>
<field name="arch" type="xml">
<filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" position="after">
- <filter string="Project Phase" name="group_project_id_phase" icon="terp-folder-violet" domain="[]" context="{'group_by':'phase_id'}" groups="base.group_extended"/>
+ <filter string="Project Phase" name="group_project_id_phase" icon="terp-folder-violet" domain="[]" context="{'group_by':'phase_id'}"/>
</filter>
</field>
</record>
@@ -367,12 +367,10 @@
# ------------------------------------------------------
<menuitem action="act_project_phase_list"
- groups="base.group_extended"
id="menu_project_phase_list" parent="project.menu_project_management" sequence="2"/>
<menuitem action="act_project_phase"
icon="STOCK_INDENT"
- groups="base.group_extended"
id="menu_project_phase" parent="base.menu_project_long_term" sequence="1"/>
<menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
@@ -385,8 +383,8 @@
<menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager"/>
<menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_users_project1" sequence="2"/>
- <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_users_project1" sequence="1"/>
- <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_users_project1" sequence="1"/>
+ <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_users_project1" sequence="5"/>
+ <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_users_project1" sequence="3"/>
</data>
</openerp>
=== modified file 'resource/resource_view.xml'
--- resource/resource_view.xml 2011-11-08 19:44:49 +0000
+++ resource/resource_view.xml 2011-11-10 06:04:18 +0000
@@ -11,11 +11,12 @@
<field name="arch" type="xml">
<search string="Search Resource">
<group>
- <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
- <separator orientation="vertical"/>
<field name="name"/>
+ <separator orientation="vertical"/>
<field name="user_id" string="User"/>
- <field name="resource_type"/>
+ <separator orientation="vertical"/>
+ <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
+ <field name="resource_type" invisible="1"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<newline/>
@@ -106,6 +107,7 @@
<field name="view_mode">tree,form</field>
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_resource_calendar_search"/>
+ <field name="help">Define working hours and time table that could be scheduled to your project members</field>
</record>
<record id="view_resource_calendar_attendance_tree" model="ir.ui.view">
@@ -173,16 +175,14 @@
<group colspan="4" col="6">
<field name="name" colspan="4"/>
<field name="active"/>
- <field name="resource_type" />
+ <field name="resource_type" invisible="1"/>
<field name="user_id" attrs="{'required':[('resource_type','=','user')], 'readonly':[('resource_type','=','material')]}"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
- <notebook colspan="4">
- <page string="General Information">
- <field name="calendar_id" string="Working Period"/>
- <field name="time_efficiency" groups="base.group_extended"/>
- </page>
- </notebook>
+ <group colspan="4">
+ <field name="calendar_id" string="Working Period"/>
+ <field name="time_efficiency" groups="base.group_extended"/>
+ </group>
</form>
</field>
</record>
@@ -196,7 +196,7 @@
<field name="name" />
<field name="user_id" />
<field name="company_id" groups="base.group_multi_company"/>
- <field name="resource_type" />
+ <field name="resource_type" invisible="1"/>
<field name="calendar_id" string="Working Period"/>
<field name="time_efficiency" groups="base.group_extended"/>
</tree>
@@ -204,12 +204,12 @@
</record>
<record id="action_resource_resource_tree" model="ir.actions.act_window">
- <field name="name">Resources</field>
+ <field name="name">User Planning</field>
<field name="res_model">resource.resource</field>
<field name="view_mode">tree,form</field>
<field name="context">{}</field>
<field name="search_view_id" ref="view_resource_resource_search"/>
- <field name="help">Resources allow you to create and manage resources that should be involved in a specific project phase. You can also set their efficiency level and workload based on their weekly working hours.</field>
+ <field name="help">Specify the efficiency level and workload based on the weekly working hours to your project's members.</field>
</record>
<record id="resource_calendar_leave_form" model="ir.ui.view">
@@ -251,12 +251,12 @@
</field>
</record>
<record id="action_resource_calendar_leave_tree" model="ir.actions.act_window">
- <field name="name">Resource Leaves</field>
+ <field name="name">Users Leaves</field>
<field name="res_model">resource.calendar.leaves</field>
<field name="view_mode">tree,form,calendar</field>
<field name="search_view_id" ref="view_resource_calendar_leaves_search"/>
</record>
- <menuitem id="menu_resource_config" name="Resource" parent="base.menu_base_config" sequence="5" groups="base.group_extended"/>
- <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search" parent="menu_resource_config" sequence="1"/>
+ <menuitem id="menu_resource_config" name="Users Planning" parent="base.menu_base_config" sequence="1" groups="base.group_extended"/>
+ <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search" parent="menu_resource_config" sequence="3"/>
</data>
</openerp>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
