[MERGE] Latest trunk.

bzr revid: vta@openerp.com-20121130111416-rust1fu0xwo132fn

4 files changed, 22 insertions, 40 deletions

diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index b2e9197cefd..2c5f311c044 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -61,7 +61,6 @@ It allows the manager to quickly check the issues, assign them and decide on the
     'installable': True,
     'auto_install': False,
     'application': True,
-    'js': ['static/src/js/project_issue.js'],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 90640363906..55aa0fd557b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -89,7 +89,7 @@ class project_issue(base_stage, osv.osv):
         project_id = self._resolve_project_id_from_context(cr, uid, context=context)
         if project_id:
             search_domain += ['|', ('project_ids', '=', project_id)]
-        search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)]
+        search_domain += [('id', 'in', ids)]
         # perform search
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
@@ -225,7 +225,7 @@ class project_issue(base_stage, osv.osv):
                              Define Responsible user and Email account for mail gateway.'),
         'partner_id': fields.many2one('res.partner', 'Contact', select=1),
         'company_id': fields.many2one('res.company', 'Company'),
-        'description': fields.text('Description'),
+        'description': fields.text('Private Note'),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=_ISSUE_STATE, string="Status", readonly=True,
                 help='The status is set to \'Draft\', when a case is created.\
@@ -244,7 +244,7 @@ class project_issue(base_stage, osv.osv):
         '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',
-                        domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
+                        domain="['&', ('fold', '=', False), ('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)]"),
@@ -442,11 +442,9 @@ class project_issue(base_stage, osv.osv):
         # OR all section_ids and OR with case_default
         search_domain = []
         if section_ids:
-            search_domain += [('|')] * len(section_ids)
+            search_domain += [('|')] * (len(section_ids)-1)
             for section_id in section_ids:
                 search_domain.append(('project_ids', '=', section_id))
-        search_domain.append(('case_default', '=', True))
-        # AND with the domain in parameter
         search_domain += list(domain)
         # perform search, return the first found
         stage_ids = self.pool.get('project.task.type').search(cr, uid, search_domain, order=order, context=context)
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index e3105127c5d..60cc6448a46 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -6,7 +6,7 @@
 
         <!-- Project issue Read/Unread actions -->
         <record id="actions_server_project_issue_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Issue: Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_issue"/>
@@ -24,7 +24,7 @@
         </record>
 
         <record id="actions_server_project_issue_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Issue: Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_issue"/>
@@ -107,30 +107,30 @@
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
                     <group>
-                        <group>
+                        <group groups="base.group_user">
                             <field name="user_id"/>
                             <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
                             <field name="email_from"/>
+                            <label for="project_id" groups="base.group_user"/>
+                            <div groups="base.group_user">
+                                <field name="project_id" on_change="on_change_project(project_id)" class="oe_inline" context="{'default_use_issues':1}"/>
+                                <button name="case_escalate" string="⇒ Escalate" type="object" states="draft,open,pending" class="oe_link"/>
+                            </div>
                         </group>
                         <group>
-                            <field name="priority"/>
-                            <label for="project_id"/>
-                            <div>
-                                <field name="project_id" required="True" on_change="on_change_project(project_id)" class="oe_inline" context="{'default_use_issues':1}"/>
-                                <button name="case_escalate" string="Escalate" type="object" states="draft,open,pending" class="oe_inline"/>
-                            </div>
-                            <label for="task_id"/>
-                            <div>
+                            <field name="categ_ids" widget="many2many_tags"/>
+                            <field name="version_id" groups="base.group_user"/>
+                            <field name="priority" groups="base.group_user"/>
+                            <label for="task_id" groups="base.group_user"/>
+                            <div groups="base.group_user">
                                 <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_inline" context="{'default_project_id':project_id}"/>
                                 <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">
-                            <field name="description" placeholder="Add a description..."/>
+                            <field name="description" placeholder="Add an internal note..." groups="base.group_user"/>
                         </page>
                         <page string="Extra Info" groups="base.group_no_one">
                             <group col="4" colspan="4">
@@ -155,7 +155,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
                     <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
@@ -249,7 +249,7 @@
                         </t>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override">
-                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">
                                         <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
@@ -264,11 +264,9 @@
                                         <field name="version_id"/>
                                     </div>
                                     <div class="oe_kanban_footer_left">
-                                        <div class="oe_left oe_tags">
-                                            <field name="categ_ids"/>
-                                        </div>
+                                        <field name="categ_ids"/>
                                         <div class="oe_right">
-                                            <span class="oe_kanban_highlight">
+                                            <span class="oe_kanban_highlight" groups="base.group_user">
                                                 <t t-set="priority" t-value="record.priority.raw_value || 5"/>
                                                 <a type="object" name="set_priority" args="['3']" t-if="priority gt 3" title="Normal Priority">
                                                    <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/>
diff --git a/addons/project_issue/static/src/js/project_issue.js b/addons/project_issue/static/src/js/project_issue.js
deleted file mode 100644
index 24e5ff7cc49..00000000000
--- a/addons/project_issue/static/src/js/project_issue.js
+++ /dev/null
@@ -1,13 +0,0 @@
-openerp.portal_project_issue = function(openerp) {
-    openerp.web_kanban.KanbanView.include({
-        on_groups_started: function() {
-            var self = this;
-            self._super.apply(this, arguments);
-
-            if (self.dataset.model === 'project.issue') {
-                // Load project's categories names from m2m field
-                self.project_display_categ_names();
-            }
-        }
-    });
-};