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

[IMP] project useability 

bzr revid: fp@openerp.com-20120929195825-5prbl0e9liixztdi
This commit is contained in:
Fabien Pinckaers 2012-09-29 21:58:25 +02:00
parent d952128b8a
commit 917ec39f14
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/project/project.py
View File

@ -509,6 +509,8 @@ def Project():
model_name=vals.get('alias_model', 'project.task'), model_name=vals.get('alias_model', 'project.task'),
context=context) context=context)
vals['alias_id'] = alias_id vals['alias_id'] = alias_id
if vals.get('partner_id', False):
vals['type'] = 'contract'
project_id = super(project, self).create(cr, uid, vals, context) project_id = super(project, self).create(cr, uid, vals, context)
mail_alias.write(cr, uid, [vals['alias_id']], {'alias_defaults': {'project_id': project_id} }, context) mail_alias.write(cr, uid, [vals['alias_id']], {'alias_defaults': {'project_id': project_id} }, context)
self.create_send_note(cr, uid, [project_id], context=context) self.create_send_note(cr, uid, [project_id], context=context)
@ -767,7 +769,7 @@ class task(base_stage, osv.osv):
}), }),
'user_id': fields.many2one('res.users', 'Assigned to'), 'user_id': fields.many2one('res.users', 'Assigned to'),
'delegated_user_id': fields.related('child_ids', 'user_id', type='many2one', relation='res.users', string='Delegated To'), 'delegated_user_id': fields.related('child_ids', 'user_id', type='many2one', relation='res.users', string='Delegated To'),
'partner_id': fields.many2one('res.partner', 'Contact'), 'partner_id': fields.many2one('res.partner', 'Customer'),
'work_ids': fields.one2many('project.task.work', 'task_id', 'Work done'), 'work_ids': fields.one2many('project.task.work', 'task_id', 'Work done'),
'manager_id': fields.related('project_id', 'analytic_account_id', 'user_id', type='many2one', relation='res.users', string='Project Manager'), 'manager_id': fields.related('project_id', 'analytic_account_id', 'user_id', type='many2one', relation='res.users', string='Project Manager'),
'company_id': fields.many2one('res.company', 'Company'), 'company_id': fields.many2one('res.company', 'Company'),

30
addons/project/project_view.xml
View File

@ -92,12 +92,12 @@
</div> </div>
<group> <group>
<group> <group>
<field name="privacy_visibility"/>
<field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/> <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
<field name="partner_id" string="Contact" on_change="onchange_partner_id(partner_id)"/>
</group> </group>
<group> <group>
<field name="privacy_visibility"/> <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field name="analytic_account_id" readonly="1" required="0"/> <field name="analytic_account_id" readonly="1" required="0" attrs="{'invisible': [('analytic_account_id','=',False)]}"/>
</group> </group>
</group> </group>
<notebook> <notebook>
@ -121,14 +121,14 @@
</field> </field>
</page> </page>
<page string="Other Info"> <page string="Other Info">
<group string="Email Interface" colspan="2">
<div attrs="{'invisible': [('alias_domain', '=', False)]}">
<field name="alias_id" invisible="1" required="0"/>
<label for="alias_name" class="oe_edit_only "/>
<field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
</div>
</group>
<group> <group>
<group string="Email Interface" attrs="{'invisible': [('alias_domain', '=', False)]}">
<div>
<field name="alias_id" invisible="1" required="0"/>
<label for="alias_name" class="oe_edit_only "/>
<field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
</div>
</group>
<group string="Administration" groups="project.group_time_work_estimation_tasks"> <group string="Administration" groups="project.group_time_work_estimation_tasks">
<field name="planned_hours" widget="float_time"/> <field name="planned_hours" widget="float_time"/>
<field name="effective_hours" widget="float_time"/> <field name="effective_hours" widget="float_time"/>
@ -136,7 +136,7 @@
</group> </group>
<group string="Miscellaneous" name="misc"> <group string="Miscellaneous" name="misc">
<field name="date"/> <field name="date"/>
<field name="priority"/> <field name="priority" groups="base.group_no_one"/>
<field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/> <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
<field name="currency_id" groups="base.group_multi_currency" required="1"/> <field name="currency_id" groups="base.group_multi_currency" required="1"/>
@ -240,7 +240,7 @@
<a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action"> <field name="task_count"/> Tasks</a> <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action"> <field name="task_count"/> Tasks</a>
</div> </div>
<div class="oe_kanban_footer_left"> <div class="oe_kanban_footer_left">
<span> <span groups="project.group_time_work_estimation_tasks">
<span class="oe_e">R</span> <span class="oe_e">R</span>
<t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/> <t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/>
</span> </span>
@ -520,7 +520,7 @@
<div class="oe_kanban_content"> <div class="oe_kanban_content">
<div><b><field name="name"/></b></div> <div><b><field name="name"/></b></div>
<div> <div>
<field name="project_id"/> <field name="project_id"/><br/>
<t t-esc="kanban_text_ellipsis(record.description.value, 160)"/><br/> <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/><br/>
<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> <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> <span t-attf-class="#{red || ''}"><i><field name="date_deadline"/></i></span>
@ -714,7 +714,7 @@
</record> </record>
<record id="ir_project_task_open" model="ir.values"> <record id="ir_project_task_open" model="ir.values">
<field eval=" 'tree_but_open'" name="key2"/> <field eval="'tree_but_open'" name="key2"/>
<field eval="'project.project'" name="model"/> <field eval="'project.project'" name="model"/>
<field name="name">View project's tasks</field> <field name="name">View project's tasks</field>
<field eval="'ir.actions.act_window,'+str(dblc_proj)" name="value"/> <field eval="'ir.actions.act_window,'+str(dblc_proj)" name="value"/>
@ -758,7 +758,7 @@
<field name="model">project.task.type</field> <field name="model">project.task.type</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Task Stage"> <tree string="Task Stage">
<field name="sequence"/> <field name="sequence" widget="handle"/>
<field name="name"/> <field name="name"/>
<field name="state"/> <field name="state"/>
</tree> </tree>