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

merge: better year/month OR separations 

bzr revid: fp@tinyerp.com-20111111153030-cl0riz63sg1qr860
This commit is contained in:
Fabien Pinckaers 2011-11-11 16:30:30 +01:00
parent 1a9df61c7e c01fd15d7c
commit 70e0dcf44e
5 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/project_issue/project_issue.py
View File

@ -216,7 +216,7 @@ class project_issue(crm.crm_case, osv.osv):
'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('object_id.model', '=', 'crm.project.bug')]"),
'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
'version_id': fields.many2one('project.issue.version', 'Version'),
'type_id': fields.many2one ('project.task.type', 'Resolution', domain="[('project_ids', '=', project_id)]"),
'type_id': fields.many2one ('project.task.type', 'Stages', domain="[('project_ids', '=', project_id)]"),
'project_id':fields.many2one('project.project', 'Project'),
'duration': fields.float('Duration'),
'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),

3
addons/project_issue/project_issue_menu.xml
View File

@ -11,9 +11,10 @@
<field name="view_mode">tree,calendar,kanban</field>
<field name="view_id" ref="project_issue_tree_view"/>
<field name="domain" eval=""/>
<field name="context">{"search_default_user_id": uid, "search_default_draft": 1, "search_default_project_id":project_id}</field>
<field name="context">{"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1, "search_default_project_id":project_id}</field>
<field name="search_view_id" ref="view_project_issue_filter"/>
<field name="help">Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com)</field>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">

8
addons/project_issue/project_issue_view.xml
View File

@ -58,7 +58,7 @@
<field name="user_id"/>
<field name="version_id" colspan="2" widget="selection"/>
<group colspan="2" col="4">
<field name="type_id" string="Resolution" />
<field name="type_id" string="Stages" />
<button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
<button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
</group>
@ -66,7 +66,7 @@
<notebook colspan="4">
<page string="General">
<group col="2" colspan="2">
<separator colspan="2" string="Communication"/>
<separator colspan="2" string="Contact Information"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)"/>
<field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
<field name="email_from"/>
@ -183,7 +183,7 @@
<field name="partner_id" groups="base.group_extended"/>
<field name="project_id" />
<field name="priority" string="Priority"/>
<field name="type_id" widget="selection" readonly="1" string="Resolution" />
<field name="type_id" widget="selection" readonly="1" string="Stages" />
<button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
<button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
<field name="version_id" widget="selection"/>
@ -209,7 +209,7 @@
<search string="Issue Tracker Search">
<group>
<filter string="New" icon="terp-document-new" name="draft" domain="[('state','=','draft')]" help="New Issues"/>
<filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
<filter string="To Do" name="todo" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
<filter string="Pending" domain="[('state','=','pending')]" help="Pending Issues" icon="terp-gtk-media-pause"/>
<separator orientation="vertical"/>
<field name="name" string="Issue / Partner" filter_domain="['|', '|', ('partner_id','ilike',self), ('email_from','ilike',self), ('name','ilike',self)]"/>

12
addons/project_issue/report/project_issue_report_view.xml
View File

@ -79,18 +79,8 @@
domain="[('state','=','done')]"/>
<separator orientation="vertical" />
<field name="section_id"
string="Sale Team "
widget="selection"
context="{'invisible_section': False}">
<filter icon="terp-crm"
context="{'invisible_section': False}"
domain="[('section_id.user_id','=',uid)]"
help="My Sale Team" />
</field>
<field name="project_id"/>
<field name="project_id"/>
<field name="user_id" select="1" widget="selection" filter_domain="[('user_id','ilike',self)]"/>
<field name="partner_id"/>
<field name="version_id" widget="selection" />

8
addons/project_issue_sheet/project_issue_sheet_view.xml
View File

@ -11,13 +11,13 @@
<attribute name="on_change">on_change_project(project_id)</attribute>
</field>
<xpath expr="/form/notebook" position="before">
<field name="analytic_account_id"
<field invisible="1" name="analytic_account_id"
domain="[('parent_id','!=',False),('partner_id', '=', partner_id),('type', '!=', 'view')]"
on_change='on_change_account_id(analytic_account_id)'
groups="base.group_extended" />
</xpath>
<notebook colspan="4">
<page string="Worklogs">
<xpath expr="//notebook/page[@string='Extra Info']" position="before">
<page string="Worklogs">
<field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}">
<tree editable="top" string="Timesheets">
<field name="name"/>
@ -33,7 +33,7 @@
</tree>
</field>
</page>
</notebook>
</xpath>
</field>
</record>
</data>