diff options
| author | Rajesh Prajapati (OpenERP) <rpr@tinyerp.com> | 2012-11-02 15:52:54 +0530 |
|---|---|---|
| committer | Rajesh Prajapati (OpenERP) <rpr@tinyerp.com> | 2012-11-02 15:52:54 +0530 |
| commit | 2b47376cd60fcfc75d52ef1264bfe43a082c307c (patch) | |
| tree | 63eb7d2031d4a03c15bf671d2e2f214970a5704f /addons/project_issue | |
| parent | a1c85f254cb2e001fc4a2cfafe8ce12cb6ab81e1 (diff) | |
| parent | bb2e63e67fd4980868dfed15736932909a3a03a9 (diff) | |
[MERGE] merge with main addons
bzr revid: rpr@tinyerp.com-20121102102254-wnzt00k9gvsy7s3w
Diffstat (limited to 'addons/project_issue')
| -rw-r--r-- | addons/project_issue/project_issue.py | 2 | ||||
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 10 | ||||
| -rw-r--r-- | addons/project_issue/report/project_issue_report_view.xml | 1 |
3 files changed, 5 insertions, 8 deletions
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 770c226fc2f..2e591826da0 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -240,7 +240,7 @@ class project_issue(base_stage, osv.osv): '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', diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 9284322880d..e3105127c5d 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -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> diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index 6bee4e38842..47ea91fad5f 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -63,7 +63,6 @@ <filter string="Sale Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" /> <filter string="Project" name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}" /> <filter string="Task" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/> - <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" /> <filter string="Version" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'version_id'}"/> <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" /> <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/> |