odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]project issue5 

bzr revid: pna@tinyerp.com-20120827053040-xq743y0ivvtrfwzc
This commit is contained in:
Pinakin Nayi (OpenERP) 2012-08-27 11:00:40 +05:30
parent 65f532e001
commit fb08d41118
10 changed files with 51 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/analytic_contract_project/analytic_contract_project_view.xml
View File

@ -106,7 +106,7 @@
<xpath expr='//tr[@name="use_tasks_row"]' position='after'> <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
<tr> <tr>
<td><group><field name="use_timesheets"/></group></td> <td><group><field name="use_timesheets"/></group></td>
<td><button icon="terp-gtk-go-back-rtl" name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/></td> <td><button name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/></td>
</tr> </tr>
</xpath> </xpath>
</field> </field>

2
addons/project/i18n/project.pot
View File

@ -1293,7 +1293,7 @@ msgstr ""
#. module: project #. module: project
#: view:project.task:0 #: view:project.task:0
msgid "Delegations History" msgid "Delegation"
msgstr "" msgstr ""
#. module: project #. module: project

3
addons/project/project.py
View File

@ -47,8 +47,9 @@ class project_task_type(osv.osv):
} }
_defaults = { _defaults = {
'sequence': 1, 'sequence': 1,
'state': 'draft', 'state': 'open',
'fold': False, 'fold': False,
'case_default': True,
} }
_order = 'sequence' _order = 'sequence'

37
addons/project/project_view.xml
View File

@ -96,11 +96,11 @@
<table> <table>
<tr name="use_tasks_row"> <tr name="use_tasks_row">
<td><group><field name="use_tasks"/></group></td> <td><group><field name="use_tasks"/></group></td>
<td><button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td> <td><button name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
</tr> </tr>
<tr name="use_attachment_row"> <tr name="use_attachment_row">
<td/> <td/>
<td><button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action"/></td> <td><button class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action"/></td>
</tr> </tr>
</table> </table>
</group> </group>
@ -128,9 +128,9 @@
<page string="Other Info"> <page string="Other Info">
<group> <group>
<group string="Administration"> <group string="Administration">
<field name="planned_hours" widget="float_time"/> <field name="planned_hours" widget="float_time" groups="project.group_time_work_estimation_tasks"/>
<field name="effective_hours" widget="float_time"/> <field name="effective_hours" widget="float_time" groups="project.group_time_work_estimation_tasks"/>
<field name="resource_calendar_id"/> <field name="resource_calendar_id" groups="project.group_long_term_planning_user"/>
</group> </group>
<group string="Miscellaneous" name="misc"> <group string="Miscellaneous" name="misc">
<field name="company_id" groups="base.group_multi_company" widget="selection" required="1"/> <field name="company_id" groups="base.group_multi_company" widget="selection" required="1"/>
@ -290,16 +290,14 @@
<field name="search_view_id" ref="view_project_project_filter"/> <field name="search_view_id" ref="view_project_project_filter"/>
<field name="context">{}</field> <field name="context">{}</field>
<field name="help" type="html"> <field name="help" type="html">
<p class="oe_form_nocontent_create"> <p class="oe_view_nocontent_create">
Click to start a new project. Click to start a new project.
</p> </p><p>
<p>
Projects are used to organize your activities; plan Projects are used to organize your activities; plan
tasks, track issues, invoice timesheets. You can define tasks, track issues, invoice timesheets. You can define
internal projects (R&amp;D, Improve Sales Process), internal projects (R&amp;D, Improve Sales Process),
private projects (My Todos) or customer ones. private projects (My Todos) or customer ones.
</p> </p><p>
<p>
You will be able collaborate with internal users on You will be able collaborate with internal users on
projects or invite customers to share your activities. projects or invite customers to share your activities.
</p> </p>
@ -400,8 +398,6 @@
states="cancelled,done" context="{'button_reactivate':True}"/> states="cancelled,done" context="{'button_reactivate':True}"/>
<button name="action_close" string="Done" type="object" <button name="action_close" string="Done" type="object"
states="draft,open,pending" class="oe_highlight"/> states="draft,open,pending" class="oe_highlight"/>
<button name="%(action_project_task_delegate)d" string="Delegate" type="action"
states="pending,open,draft" groups="project.group_delegate_task"/>
<button name="do_cancel" string="Cancel" type="object" <button name="do_cancel" string="Cancel" type="object"
states="draft,open,pending"/> states="draft,open,pending"/>
</span> </span>
@ -450,7 +446,9 @@
</group> </group>
<div class="oe_clear"/> <div class="oe_clear"/>
</page> </page>
<page string="Delegations History" groups="project.group_delegate_task"> <page string="Delegation" groups="project.group_delegate_task">
<button name="%(action_project_task_delegate)d" string="Delegate" type="action"
states="pending,open,draft" groups="project.group_delegate_task"/>
<separator string="Parent Tasks"/> <separator string="Parent Tasks"/>
<field name="parent_ids"/> <field name="parent_ids"/>
<separator string="Delegated tasks"/> <separator string="Delegated tasks"/>
@ -518,10 +516,10 @@
<li><a type="delete">Delete</a></li> <li><a type="delete">Delete</a></li>
<li> <li>
<ul class="oe_kanban_project_times"> <ul class="oe_kanban_project_times">
<li><a name="set_remaining_time_1" type="object" class="oe_kanban_button">1</a></li> <li><a name="set_remaining_time_1" type="object" class="oe_kanban_button" groups="project.group_time_work_estimation_tasks">1</a></li>
<li><a name="set_remaining_time_2" type="object" class="oe_kanban_button">2</a></li> <li><a name="set_remaining_time_2" type="object" class="oe_kanban_button" groups="project.group_time_work_estimation_tasks">2</a></li>
<li><a name="set_remaining_time_5" type="object" class="oe_kanban_button">5</a></li> <li><a name="set_remaining_time_5" type="object" class="oe_kanban_button" groups="project.group_time_work_estimation_tasks">5</a></li>
<li><a name="set_remaining_time_10" type="object" class="oe_kanban_button">10</a></li> <li><a name="set_remaining_time_10" type="object" class="oe_kanban_button" groups="project.group_time_work_estimation_tasks">10</a></li>
<li><a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a></li> <li><a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a></li>
</ul> </ul>
</li> </li>
@ -534,7 +532,8 @@
<div> <div>
<field name="project_id"/> <field name="project_id"/>
<t t-esc="kanban_text_ellipsis(record.description.value, 160)"/><br/> <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/><br/>
<i><field name="date_deadline"/></i> <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
<span t-attf-class="#{red || ''}"><i><field name="date_deadline"/></i></span>
</div> </div>
<div class="oe_kanban_bottom_right"> <div class="oe_kanban_bottom_right">
<a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="Ready to Pull" name="set_kanban_state_done" class="oe_kanban_status"> </a> <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="Ready to Pull" name="set_kanban_state_done" class="oe_kanban_status"> </a>
@ -798,7 +797,7 @@
<menuitem id="menu_tasks_config" name="GTD" parent="base.menu_definitions" sequence="1"/> <menuitem id="menu_tasks_config" name="GTD" parent="base.menu_definitions" sequence="1"/>
<menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1"/> <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_custom" sequence="1"/>
<menuitem action="open_task_type_form" name="Task Stages" id="menu_task_types_view" parent="base.menu_project_config_project" sequence="2"/> <menuitem action="open_task_type_form" name="Task Stages" id="menu_task_types_view" parent="base.menu_project_config_project" sequence="2"/>
<menuitem action="open_view_project_all" id="menu_projects" name="Projects" parent="menu_project_management" sequence="1"/> <menuitem action="open_view_project_all" id="menu_projects" name="Projects" parent="menu_project_management" sequence="1"/>

14
addons/project/res_config.py
View File

@ -52,7 +52,7 @@ class project_configuration(osv.osv_memory):
'module_project_issue_sheet': fields.boolean("invoice working time on issues", 'module_project_issue_sheet': fields.boolean("invoice working time on issues",
help="""Provides timesheet support for the issues/bugs management in project. help="""Provides timesheet support for the issues/bugs management in project.
This installs the module project_issue_sheet."""), This installs the module project_issue_sheet."""),
'group_tasks_work_on_tasks': fields.boolean("compute work activities on tasks", 'group_tasks_work_on_tasks': fields.boolean("Log work activities on tasks",
implied_group='project.group_tasks_work_on_tasks', implied_group='project.group_tasks_work_on_tasks',
help="Allows you to compute work on tasks."), help="Allows you to compute work on tasks."),
'group_time_work_estimation_tasks': fields.boolean("manage time estimation on tasks", 'group_time_work_estimation_tasks': fields.boolean("manage time estimation on tasks",
@ -72,4 +72,16 @@ class project_configuration(osv.osv_memory):
user = self.pool.get('res.users').browse(cr, uid, uid, context) user = self.pool.get('res.users').browse(cr, uid, uid, context)
user.company_id.write({'project_time_mode_id': config.time_unit.id}) user.company_id.write({'project_time_mode_id': config.time_unit.id})
def onchange_time_estimation(self, cr, uid, ids, group_time_work_estimation_tasks):
if group_time_work_estimation_tasks:
return {'value': {'group_tasks_work_on_tasks': True}}
else :
return {'value': {'group_tasks_work_on_tasks': False}}
def onchange_project_timesheet(self, cr, uid, ids, module_project_timesheet):
if module_project_timesheet:
return {'value': {'group_tasks_work_on_tasks': True}}
else :
return {'value': {'group_tasks_work_on_tasks': False}}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/project/res_config_view.xml
View File

@ -30,7 +30,7 @@
<label for="id" string="Task"/> <label for="id" string="Task"/>
<div> <div>
<div> <div>
<field name="module_project_timesheet" class="oe_inline"/> <field name="module_project_timesheet" on_change="onchange_project_timesheet(module_project_timesheet)" class="oe_inline"/>
<label for="module_project_timesheet"/> <label for="module_project_timesheet"/>
</div> </div>
<div> <div>
@ -51,7 +51,7 @@
<label for="id" string="Planning"/> <label for="id" string="Planning"/>
<div> <div>
<div> <div>
<field name="group_time_work_estimation_tasks" class="oe_inline"/> <field name="group_time_work_estimation_tasks" on_change="onchange_time_estimation(group_time_work_estimation_tasks)" class="oe_inline"/>
<label for="group_time_work_estimation_tasks"/> <label for="group_time_work_estimation_tasks"/>
</div> </div>
<div> <div>

5
addons/project/security/project_security.xml
View File

@ -7,6 +7,11 @@
<field name="category_id" ref="base.module_category_project_management"/> <field name="category_id" ref="base.module_category_project_management"/>
</record> </record>
<record id="group_long_term_planning_user" model="res.groups">
<field name="name">Long Term Planning / User</field>
<field name="category_id" ref="base.module_category_project_management"/>
</record>
<record id="group_project_manager" model="res.groups"> <record id="group_project_manager" model="res.groups">
<field name="name">Manager</field> <field name="name">Manager</field>
<field name="category_id" ref="base.module_category_project_management"/> <field name="category_id" ref="base.module_category_project_management"/>

11
addons/project_issue/project_issue_view.xml
View File

@ -100,8 +100,6 @@
states="open"/> states="open"/>
<button name="case_close" string="Done" type="object" <button name="case_close" string="Done" type="object"
states="draft,pending"/> states="draft,pending"/>
<button name="case_escalate" string="Escalate" type="object"
states="draft,open,pending"/>
<button name="case_cancel" string="Cancel" type="object" <button name="case_cancel" string="Cancel" type="object"
states="draft,open,pending"/> states="draft,open,pending"/>
</span> </span>
@ -116,9 +114,12 @@
<field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)"/> <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)"/>
<field name="email_from"/> <field name="email_from"/>
</group> </group>
<group> <group col="2" colspan="1">
<field name="priority"/> <field name="priority"/>
<field name="project_id" required="True" on_change="on_change_project(project_id)" context="{'default_use_issues':1}"/> <group col="3" colspan="2">
<field name="project_id" required="True" on_change="on_change_project(project_id)" context="{'default_use_issues':1}"/>
<button name="case_escalate" string="Escalate" type="object" states="draft,open,pending"/>
</group>
<label for="task_id"/> <label for="task_id"/>
<div> <div>
<field name="task_id" on_change="onchange_task_id(task_id)" class="oe_inline" context="{'default_project_id':project_id}"/> <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_inline" context="{'default_project_id':project_id}"/>
@ -358,7 +359,7 @@
<xpath expr='//tr[@name="use_tasks_row"]' position='after'> <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
<tr> <tr>
<td><group><field name="use_issues"/></group></td> <td><group><field name="use_issues"/></group></td>
<td><button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/></td> <td><button name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/></td>
</tr> </tr>
</xpath> </xpath>
<field name="priority" position="before"> <field name="priority" position="before">

4
addons/project_long_term/project_long_term_view.xml
View File

@ -99,7 +99,7 @@
<xpath expr='//tr[@name="use_tasks_row"]' position='after'> <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
<tr> <tr>
<td><group><field name="use_phases"/></group></td> <td><group><field name="use_phases"/></group></td>
<td><button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td> <td><button name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
</tr> </tr>
</xpath> </xpath>
</field> </field>
@ -369,7 +369,7 @@
parent="base.menu_project_long_term" sequence="2"/> parent="base.menu_project_long_term" sequence="2"/>
<menuitem id="menu_pm_users_project1" <menuitem id="menu_pm_users_project1"
name="Resources" parent="base.menu_definitions" sequence="3"/> name="Resources" parent="base.menu_custom" sequence="3"/>
<menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager"/> <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_resource_tree" id="menu_view_resource" parent="menu_pm_users_project1" sequence="2"/>

1
addons/project_mrp/project_procurement.py
View File

@ -73,6 +73,7 @@ class procurement_order(osv.osv):
'date_deadline': procurement.date_planned, 'date_deadline': procurement.date_planned,
'planned_hours': planned_hours, 'planned_hours': planned_hours,
'remaining_hours': planned_hours, 'remaining_hours': planned_hours,
'partner_id':procurement.sale_line_id.order_id.partner_id.id,
'user_id': procurement.product_id.product_manager.id, 'user_id': procurement.product_id.product_manager.id,
'notes': procurement.note, 'notes': procurement.note,
'procurement_id': procurement.id, 'procurement_id': procurement.id,