Amit Patel (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-project_issue-nco into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-project_issue-nco/+merge/132241
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-project_issue-nco/+merge/132241
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-project_issue-nco.
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2012-10-29 15:25:57 +0000
+++ project/project_view.xml 2012-10-31 07:31:24 +0000
@@ -238,7 +238,10 @@
<h4><field name="name"/></h4>
<div class="oe_kanban_project_list">
- <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action" style="margin-right: 10px"> <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" style="margin-right: 10px">
+ <span t-if="record.task_count.raw_value gt 1"><field name="task_count"/> Tasks</span>
+ <span t-if="record.task_count.raw_value lt 2"><field name="task_count"/> Task</span>
+ </a>
</div>
<div class="oe_kanban_footer_left">
<span groups="project.group_time_work_estimation_tasks">
=== modified file 'project/static/src/css/project.css'
--- project/static/src/css/project.css 2012-09-12 15:11:51 +0000
+++ project/static/src/css/project.css 2012-10-31 07:31:24 +0000
@@ -7,8 +7,9 @@
min-height: 160px;
}
-.oe_kanban_project_list {
+.oe_kanban_project_list > a > span:hover{
margin: 4px 0;
+ text-decoration: underline;
}
.openerp .oe_kanban_content h4 {
=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py 2012-10-24 20:14:24 +0000
+++ project_issue/project_issue.py 2012-10-31 07:31:24 +0000
@@ -240,7 +240,7 @@
'date_closed': fields.datetime('Closed', readonly=True,select=True),
'date': fields.datetime('Date'),
'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."),
- 'categ_ids': fields.many2many('project.category', string='Categories'),
+ 'categ_ids': fields.many2many('project.category', string='Tags'),
'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
'version_id': fields.many2one('project.issue.version', 'Version'),
'stage_id': fields.many2one ('project.task.type', 'Stage',
=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml 2012-10-29 09:14:55 +0000
+++ project_issue/project_issue_view.xml 2012-10-31 07:31:24 +0000
@@ -125,15 +125,11 @@
<field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}" class="oe_inline"/>
</div>
<field name="categ_ids" widget="many2many_tags"/>
+ <field name="version_id"/>
</group>
</group>
<notebook>
<page string="Description">
- <group>
- <group>
- <field name="version_id" widget="selection"/>
- </group>
- </group>
<field name="description" placeholder="Add a description..."/>
</page>
<page string="Extra Info" groups="base.group_no_one">
@@ -380,7 +376,9 @@
<xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
<a t-if="record.use_issues.raw_value" style="margin-right: 10px"
name="%(act_project_project_2_project_issue_all)d" type="action">
- <field name="issue_count"/> Issues</a>
+ <span t-if="record.issue_count.raw_value gt 1"><field name="issue_count"/> Issues</span>
+ <span t-if="record.issue_count.raw_value lt 2"><field name="issue_count"/> Issue</span>
+ </a>
</xpath>
</field>
</record>
_______________________________________________
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
