diff options
| author | qdp-odoo <qdp@odoo.com> | 2016-04-01 14:50:57 +0200 |
|---|---|---|
| committer | qdp-odoo <qdp@odoo.com> | 2016-04-01 14:50:57 +0200 |
| commit | 2b039c7643350e961bcf032ffd9e97a039eeab35 (patch) | |
| tree | 6833b499bb3492ccb42b00a9da4e8f62071b6c2a /addons/project_issue | |
| parent | 17f4d2259457d76d5d99f6d846cbec75e6f94692 (diff) | |
| parent | 7853c9c7bb7e3155606b3986577e757fc9843c4d (diff) | |
[MERGE] forward port of branch 'saas-7' into saas-9 up to revision 7853c9c7bb7e3155606b3986577e757fc9843c4d
Diffstat (limited to 'addons/project_issue')
| -rw-r--r-- | addons/project_issue/project_dashboard.xml | 12 | ||||
| -rw-r--r-- | addons/project_issue/project_issue.py | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/addons/project_issue/project_dashboard.xml b/addons/project_issue/project_dashboard.xml index 381a6173026..b7197fa086d 100644 --- a/addons/project_issue/project_dashboard.xml +++ b/addons/project_issue/project_dashboard.xml @@ -10,15 +10,13 @@ <field name="issue_needaction_count" invisible="1"/> </field> <xpath expr="//div/a[contains(@class, 'o_project_kanban_box')]" position="after"> - <div t-if="record.use_issues.raw_value" class="o_project_kanban_box"> - <a name="%(act_project_project_2_project_issue_all)d" type="action"> - <span class="o_value"><t t-raw="record.issue_ids.raw_value.length"/></span> - <span class="o_label"><field name="label_issues"/></span> - </a> + <a t-if="record.use_issues.raw_value" class="o_project_kanban_box" name="%(act_project_project_2_project_issue_all)d" type="action"> + <span class="o_value"><t t-raw="record.issue_ids.raw_value.length"/></span> + <span class="o_label"><field name="label_issues"/></span> <a t-if="record.issue_needaction_count.raw_value" class="o_needaction" name="%(act_project_project_2_project_issue_all)d" type="action" context="{'search_default_message_needaction': 1}"> <t t-esc="record.issue_needaction_count.raw_value"/> </a> - </div> + </a> </xpath> <xpath expr="//div[contains(@class, 'o_kanban_manage_reports')]" position="inside"> @@ -29,4 +27,4 @@ </field> </record> -</odoo>
\ No newline at end of file +</odoo> diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index f5dabcc2ba4..2699625bd79 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -483,7 +483,7 @@ class project(osv.Model): _columns = { 'issue_count': fields.function(_issue_count, type='integer', string="Issues",), 'issue_ids': fields.one2many('project.issue', 'project_id', string="Issues", - domain=[('stage_id.fold', '=', False)]), + domain=['|', ('stage_id.fold', '=', False), ('stage_id', '=', False)]), 'issue_needaction_count': fields.function(_issue_needaction_count, type='integer', string="Issues",), } |