Merge lp:~gs.clearcorp/openerp-ccorp-addons/7.0_project_extended into lp:openerp-ccorp-addons/7.0

[Glen Sojo]

[ADD] - project_extended: Added name_search to allow searching using code, shortcut_name and name. Added domain to project_id one2many relationship in order to filter projects not able to handle tasks. Added custom filter to search for projects using the same fields mentioned above. And modified kanban view to show the shortcut_name instead of the default name

=== modified file 'project_extended/__openerp__.py'
--- project_extended/__openerp__.py	2013-07-10 21:46:42 +0000
+++ project_extended/__openerp__.py	2014-02-10 21:37:42 +0000
@@ -21,20 +21,18 @@
 ##############################################################################
 
 {
-    "name" : 'Project extended',
+    "name" : 'Project Extended',
     "version" : '1.0',
     "author" : 'CLEARCORP S.A',
-    #easy, normal, expert
-    'complexity': 'normal',
+    'complexity': 'easy',
     "description": """
-This module changes de reference name of the project by a concatenated name using the project code.
+This module changes the reference name of the project by a concatenated name using the project code.
 This module added id_task in project task
     """,
     "category": 'Project Management',
     "sequence": 4,
     "website" : "http://clearcorp.co.cr",
     "images" : [],
-    "icon" : False,
     "depends" : ['base','project'],
     "init_xml" : [],
     "demo_xml" : [],

=== modified file 'project_extended/project_extended.py'
--- project_extended/project_extended.py	2013-09-24 15:28:56 +0000
+++ project_extended/project_extended.py	2014-02-10 21:37:42 +0000
@@ -24,7 +24,7 @@
 from dateutil.relativedelta import relativedelta
 from datetime import datetime
 
-class project(osv.osv):
+class project(osv.Model):
     _inherit = 'project.project'
     
     def name_get(self, cr, uid, ids=[], context=None):
@@ -80,6 +80,20 @@
         res =  super(project, self).unlink(cr, uid, ids, context=context)
         ir_sequence_obj.unlink(cr, uid, ir_sequence_ids, context=context)
         return res
+    
+    def name_search(self, cr, uid, name='', args=None, operator='ilike', context=None, limit=50):
+        ids = []
+        
+        if name:
+            ids = self.search(cr, uid,
+                              ['|',('shortcut_name',operator,name),
+                               '|', ('name',operator,name),
+                               ('code',operator,name)] + args,
+                              limit=limit, context=context)
+        else:
+            ids  = self.search(cr, uid, args, limit=limit, context=context)
+        
+        return self.name_get(cr, uid, ids, context=context)
         
 class task(osv.osv):
     def _get_color_code(self, date_start, date_deadline, planned_hours, state):

=== modified file 'project_extended/project_extended_view.xml'
--- project_extended/project_extended_view.xml	2013-09-23 18:19:44 +0000
+++ project_extended/project_extended_view.xml	2014-02-10 21:37:42 +0000
@@ -17,18 +17,17 @@
             </field>
         </record>
         
-        <!-- TODO
-        <record id="view_project_kanban_inherited" model="ir.ui.view">
-            <field name="name">project.project.kanban.inherited</field>
+        <!-- kanban -->
+        <record id="view_project_kanban" model="ir.ui.view">
+            <field name="name">view.project.kanban</field>
             <field name="model">project.project</field>
             <field name="inherit_id" ref="project.view_project_kanban"/>
             <field name="arch" type="xml">
-                <field name="name" position="replace">
+                <xpath expr="//kanban/templates/t/div/div[@class='oe_kanban_content']/h4/field[@name='name']" position="replace">
                     <field name="shortcut_name"/>
-                </field>
+                </xpath>
             </field>
         </record>
-        -->
         
         <record id="view_task_form2_inherit" model="ir.ui.view">
             <field name="name">project.task.form.inherit</field>
@@ -52,8 +51,14 @@
             <field name="model">project.project</field>
             <field name="inherit_id" ref="project.view_project_project_filter"/>
             <field name="arch" type="xml">
+                <xpath expr="//search[@string='Search Project']/filter[@name='Template']" position="after">
+                    <separator/>
+                    <filter icon="terp-check" string="Using Tasks" name="UseTasks" domain="[('use_tasks','=','True')]" help="Projects using Tasks"/>
+                </xpath>
                 <xpath expr="//search[@string='Search Project']/field[@name='name']" position="replace">
-                    <field name="shortcut_name" string="Project Shortcut Name"/>
+                    <field name="shortcut_name"
+                        string="Project Name"
+                        filter_domain="['|',('name','ilike',self),'|',('shortcut_name','ilike',self),('code','ilike',self)]"/>
                 </xpath>
                 <xpath expr="//group/filter[@name='Parent']" position="after">
                     <filter string="Period" name="group_date_start" icon="terp-personal" domain="[]"  context="{'group_by':'date_start'}"/>
@@ -75,6 +80,21 @@
             </field>
         </record>
         
+        <!-- form -->
+        <record id="view_task_form" model="ir.ui.view" >
+            <field name="name">view.task.form</field>
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="arch" type="xml">
+                <xpath expr="//form/sheet/group/group/field[@name='project_id']" position="replace">
+                    <field name="project_id" 
+                        on_change="onchange_project(project_id)"
+                        context="{'default_use_tasks':1}"
+                        domain="[('use_tasks','=','True')]"/>
+                </xpath>
+            </field>
+        </record>
+        
         <!--project.task kanban view-->
         <record id="project_extended_project_task_kanban_view" model="ir.ui.view" >
             <field name="name">project.extended.project.task.kanban.view</field>
@@ -165,5 +185,11 @@
             </field>
         </record>
         
+        <!-- Actions -->
+        <!-- project.project -->
+        <record id="project.open_view_project_all" model="ir.actions.act_window">
+            <field name="context">{'search_default_Current': 1, 'search_default_UseTasks': 1}</field>
+        </record>
+        
     </data>
 </openerp>