diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-03-02 18:25:40 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-03-02 18:25:40 +0100 |
| commit | 9cf6786e758e4e330d8f566b26a8a7a4db6ba687 (patch) | |
| tree | 0c19c2c847192495ad1e665f3c806bb72d45cf2e /addons/project_issue | |
| parent | 7c8d295a40ccf189a8d9211731a1e4171815cbc8 (diff) | |
| parent | fefb29897272bf0fe6a6e8aca98b1e2c88ae6af5 (diff) | |
[MERGE] forward port of branch saas-6 up to fefb298
Diffstat (limited to 'addons/project_issue')
| -rw-r--r-- | addons/project_issue/project_issue.py | 4 | ||||
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 2a3ec26e891..cea055ec30a 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -493,7 +493,7 @@ class project(osv.Model): states={'close': [('readonly', True)], 'cancelled': [('readonly', True)]}), 'issue_count': fields.function(_issue_count, type='integer', string="Issues",), 'issue_ids': fields.one2many('project.issue', 'project_id', string="Issues", - domain=[('date_closed', '!=', False)]), + domain=[('stage_id.fold', '=', False)]), } def _check_escalation(self, cr, uid, ids, context=None): @@ -580,7 +580,7 @@ class res_partner(osv.osv): partner_id: Issue.search_count(cr,uid, [('partner_id', '=', partner_id)]) for partner_id in ids } - + """ Inherits partner and adds Issue information in the partner form """ _inherit = 'res.partner' _columns = { diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 05da0efa5ae..40abd94245d 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -350,15 +350,15 @@ <field name="issue_ids" invisible="1"/> </field> <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]/div" position="after"> - <div class="col-md-6"> - <a t-if="record.use_issues.raw_value" name="%(act_project_project_2_project_issue_all)d" type="action"> + <div t-if="record.use_issues.raw_value" class="col-md-6"> + <a name="%(act_project_project_2_project_issue_all)d" type="action"> <t t-raw="record.issue_ids.raw_value.length"/> <field name="label_issues"/> </a> </div> </xpath> <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]/div[contains(@class, 'col-md-12')]" position="replace"> - <div t-if="!(record.use_tasks.raw_value and record.task_count.raw_value gt 0) and !(record.use_issues.raw_value and record.issue_ids.raw_value.length gt 0)" class="col-md-12"> + <div t-if="(record.use_tasks.raw_value or record.use_issues.raw_value) and !(record.use_tasks.raw_value and record.task_count.raw_value gt 0) and !(record.use_issues.raw_value and record.issue_ids.raw_value.length gt 0)" class="col-md-12"> <img src="/project/static/src/img/top_left_arrow.png" style="margin-top: -8px; width: 22px;" /> <span>No activity yet, click to enter in the project.</span> </div> |