Merge

bzr revid: sbh@tinyerp.com-20100309051711-cpxuempzg840hwdu

13 files changed, 152 insertions, 84 deletions

diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py
index f406d884ec8..9a72c83fab5 100644
--- a/addons/account/report/account_tax_code.py
+++ b/addons/account/report/account_tax_code.py
@@ -47,8 +47,6 @@ def _record_to_report_line(record):
             }
 
 class account_tax_code_report(rml_parse.rml_parse):
-    _name = 'report.account.tax.code.entries'
-
     def __init__(self, cr, uid, name, context):
         super(account_tax_code_report, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
diff --git a/addons/account/test/price_accuracy00.yaml b/addons/account/test/price_accuracy00.yaml
index f33d3af499b..a825700e4b7 100644
--- a/addons/account/test/price_accuracy00.yaml
+++ b/addons/account/test/price_accuracy00.yaml
@@ -1,6 +1,5 @@
--
-    Tax Scenario
-
+- |
+    Tax Scenario:
     In order to check that the accounting entries and tax engine works
     efficiently with all kind of price accuracies we run this test scenario.
 -
@@ -55,7 +54,7 @@
     Then, I change the precision of numbers to 3 digits.
 -
     !record {model: decimal.precision, id: product.decimal_account}:
-      digits: 2
+      digits: 3
 -
     And I create another invoice with the same content.
 -
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 2955d97b501..0ece4690d9f 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -63,7 +63,7 @@ class auction_dates(osv.osv):
         return name
 
     _columns = {
-        'name': fields.char('Auction date', size=64, required=True),
+        'name': fields.char('Auction Name', size=64, required=True),
         'expo1': fields.date('First Exposition Day', required=True),
         'expo2': fields.date('Last Exposition Day', required=True),
         'auction1': fields.date('First Auction Day', required=True),
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index a7b2c79759f..8bc6f56117d 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -280,7 +280,7 @@ class crm_case(osv.osv):
         'section_id': _get_section,
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c),
     }
-    _order = 'date_deadline desc, id desc'
+    _order = 'date_deadline desc, create_date desc,id desc'
 
     def unlink(self, cr, uid, ids, context={}):
         for case in self.browse(cr, uid, ids, context):
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 274d9f8c2e4..92c08594c11 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -162,7 +162,7 @@
 			<field name="arch" type="xml">
 				<tree string="Registration">
 					<field name="id"/>
-					<field name="date"/>
+					<field name="create_date"/>
 					<field name="event_id"/>
 					<field name="partner_id"/>
 					<field name="nb_register"/>
@@ -331,14 +331,14 @@
 		</record>
 
 		<record model="ir.actions.act_window" id="action_event_registration">
-			<field name="name">Events On Registrations</field>
+			<field name="name">Registration by Event</field>
 			<field name="res_model">report.event.registration</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,graph</field>
 		</record>
 		<menuitem name="Reporting" id="menu_report_event" parent="menu_marketing_event_main" sequence="20"/>
 		<!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
-		<menuitem parent="menu_event_main" action="action_event_registration" id="menu_report_event_registration" name="Registrations Per Event"/>
+		<menuitem parent="menu_event_main" action="action_event_registration" id="menu_report_event_registration" />
 	<!-- end... -->
 
 
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 4d701341a72..b90f9dd1a89 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -80,20 +80,20 @@ class hr_contract(osv.osv):
     _name = 'hr.contract'
     _description = 'Contract'
     _columns = {
-        'name' : fields.char('Contract Reference', size=30, required=True),
-        'employee_id' : fields.many2one('hr.employee', "Employee", required=True),
-        'department_id' : fields.related('employee_id','department_id', string="Department", readonly=True),
-        'type_id' : fields.many2one('hr.contract.type', "Contract Type"),
-        'job_id' : fields.many2one('hr.job', 'Job Title'),
-        'date_start' : fields.date('Start Date', required=True),
-        'date_end' : fields.date('End Date'),
-        'working_hours_per_day_id' : fields.many2one('resource.calendar','Working hours per day'),
-        'wage_type_id' : fields.many2one('hr.contract.wage.type', 'Wage Type', required=True),
-        'wage' : fields.float('Wage', digits=(16,2), required=True),
+        'name': fields.char('Contract Reference', size=30, required=True),
+        'employee_id': fields.many2one('hr.employee', "Employee", required=True),
+        'department_id': fields.related('employee_id','department_id', string="Department", readonly=True),
+        'type_id': fields.many2one('hr.contract.type', "Contract Type"),
+        'job_id': fields.many2one('hr.job', 'Job Title'),
+        'date_start': fields.date('Start Date', required=True),
+        'date_end': fields.date('End Date'),
+        'working_hours': fields.many2one('resource.calendar','Working hours'),
+        'wage_type_id': fields.many2one('hr.contract.wage.type', 'Wage Type', required=True),
+        'wage': fields.float('Wage', digits=(16,2), required=True),
         'advantages': fields.text('Advantages'),
         'advantages_net': fields.float('Net Advantages Value', digits=(16,2)),
         'advantages_gross': fields.float('Gross Advantages Value', digits=(16,2)),
-        'notes' : fields.text('Notes'),
+        'notes': fields.text('Notes'),
     }
     _defaults = {
         'date_start' : lambda *a : time.strftime("%Y-%m-%d"),
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 13e61c21ac4..e198cc35de5 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -57,9 +57,9 @@
             <field name="res_model">hr.contract.wage.type.period</field>
             <field name="view_type">form</field>
         </record>
-        <menuitem 
-                action="action_hr_contract_wage_type_period" 
-                id="hr_menu_contract_wage_type_period" 
+        <menuitem
+                action="action_hr_contract_wage_type_period"
+                id="hr_menu_contract_wage_type_period"
                 parent="hr_contract.next_id_56"/>
 
 
@@ -76,7 +76,7 @@
                                 <field name="job_id"/>
                                 <field name="date_start"/>
                                 <field name="date_end"/>
-                                <field name="working_hours_per_day_id"/>
+                                <field name="working_hours"/>
                                 <field name="wage_type_id"/>
                                 <field name="wage"/>
                             </tree>
@@ -95,7 +95,7 @@
                                         <separator colspan="2" string="Duration"/>
                                         <field name="date_start" select="1"/>
                                         <field name="date_end" select="1"/>
-                                        <field name="working_hours_per_day_id"/>
+                                        <field name="working_hours"/>
                                     </group>
                                     <group col="2" colspan="2">
                                         <separator colspan="2" string="Advantages"/>
@@ -165,7 +165,7 @@
                             <separator colspan="2" string="Duration"/>
                             <field name="date_start" select="1"/>
                             <field name="date_end" select="1"/>
-                            <field name="working_hours_per_day_id"/>
+                            <field name="working_hours"/>
                         </group>
                         <group col="2" colspan="2">
                             <separator colspan="2" string="Advantages"/>
@@ -204,7 +204,7 @@
                     <field name="department_id"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
-                    <field name="working_hours_per_day_id"/>
+                    <field name="working_hours"/>
                     <field name="wage_type_id"/>
                     <field name="wage"/>
                 </tree>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index ef1df892668..17c113acd78 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -197,24 +197,24 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
-                   <group col="10" colspan="4">		                						
-						<filter icon="terp-crm" string="Unvalidated" domain="[('state','&lt;&gt;','done'),('date_to','&lt;',time.strftime('%%Y-%%m-%%d'))]" help="Unvalidated Timesheets"/>
-                       	<separator orientation="vertical"/>
-                       	<field name="state">
-                           <filter icon="terp-hr" domain="[('state','=','draft')]" help="Draft Timesheets"/>
-                           <filter icon="terp-hr" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
-						</field>
-						<field name="name" select="1"/>
-						<field name="user_id" select="1" widget="selection">
+                    <group col="10" colspan="4">
+                        <filter icon="terp-crm" string="Unvalidated" domain="[('state','!=','done'),('date_to','&lt;',current_date')]" help="Unvalidated Timesheets"/>
+                        <separator orientation="vertical"/>
+                        <field name="state">
+                            <filter icon="terp-hr" domain="[('state','=','draft')]" help="Draft Timesheets"/>
+                            <filter icon="terp-hr" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
+                        </field>
+                        <field name="name" select="1"/>
+                        <field name="user_id" select="1" widget="selection">
                             <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Timesheet"/>
                         </field>
-						<field name="department_id" widget="selection">
-							<filter icon="terp-crm"
-								domain="[('department_id','=',context.get('department_id',False))]"
-								help="My Departments Timesheet"/>
-						</field>
-                   </group>
-               </search>
+                        <field name="department_id" widget="selection">
+                            <filter icon="terp-crm"
+                                domain="[('department_id','=',context.get('department_id',False))]"
+                                help="My Departments Timesheet"/>
+                        </field>
+                    </group>
+                </search>
             </field>
         </record>
 
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 2bc1ac1d48d..3e22529332f 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -97,7 +97,7 @@
         <!-- MEMBERSHIP/CURRENT MEMBERS -->
 
         <record model="ir.ui.view" id="membership_members_tree">
-            <field name="name">Current members</field>
+            <field name="name">Members</field>
             <field name="model">res.partner</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
@@ -129,10 +129,10 @@
 	    </record>
 
         <record model="ir.actions.act_window" id="action_membership_members">
-            <field name="name">Current members</field>
+            <field name="name">Members</field>
             <field name="res_model">res.partner</field>
             <field name="domain">[('membership_state','&lt;&gt;','none'),('membership_state','&lt;&gt;','canceled'),('membership_state','&lt;&gt;','old'),('membership_state','&lt;&gt;','waiting')]</field>
-        	<field name="search_view_id" ref="view_res_partner_member_filter"/>
+            <field name="search_view_id" ref="view_res_partner_member_filter"/>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_membership_members_view_tree">
@@ -148,10 +148,7 @@
             <field name="act_window_id" ref="action_membership_members"/>
         </record>
 
-        <menuitem name="Current members" parent="menu_member"
-            id="menu_members"
-            sequence="2"
-            action="action_membership_members"/>
+        <menuitem name="Members" parent="menu_member" id="menu_members" sequence="2" action="action_membership_members"/>
 
         <!-- PARTNERS -->
 
@@ -189,7 +186,7 @@
                         <field name="membership_start" select="2"/>
                         <field name="membership_stop" select="2"/>
                         <field name="membership_cancel" select="2"/>
-                        <field name="member_lines" nolabel="1" colspan="4" readonly="1">
+                        <field name="member_lines" nolabel="1" colspan="4">
                             <tree string="Membership">
                                 <field name="date_from"/>
                                 <field name="date_to"/>
diff --git a/addons/project/project.py b/addons/project/project.py
index 7a412bfecfe..e9c11cc605c 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -299,7 +299,7 @@ class task(osv.osv):
         'remaining_hours': fields.float('Remaining Hours', digits=(16,4), help="Total remaining time, can be re-estimated periodically by the assignee of the task."),
         'total_hours': fields.function(_hours_get, method=True, string='Total Hours', multi='hours', store=True, help="Computed as: Time Spent + Remaining Time."),
         'progress': fields.function(_hours_get, method=True, string='Progress (%)', multi='hours', store=True, help="Computed as: Time Spent / Total Time."),
-        'delay_hours': fields.function(_hours_get, method=True, string='Delay Hours', multi='hours', store=True, help="Computed as: Total Time - Estimated Time. It gives the difference of the time estimated by the project manager and the real time to close the task."),
+        'delay_hours': fields.function(_hours_get, method=True, string='Delay Hours', multi='hours', store=True, help="Computed as difference of the time estimated by the project manager and the real time to close the task."),
 
         'user_id': fields.many2one('res.users', 'Assigned to'),
         'delegated_user_id': fields.related('child_ids','user_id',type='many2one', relation='res.users', string='Delegated To'),
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 75bc18922eb..7c34807517a 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -42,7 +42,7 @@
         <field name="global" eval="True"/>
     </record>
     <record model="ir.rule" id="task_visibility_rule">
-        <field name="domain_force">['|','|',('user_id','=',user.id),('project_id.members','=',user.id),('project_id.user_id','=',user.id)]</field>
+        <field name="domain_force">['|','|','|',('user_id','=',False),('user_id','=',user.id),('project_id.members','=',user.id),('project_id.user_id','=',user.id)]</field>
         <field name="rule_group" ref="task_visibility_rule_group"/>
     </record>
 
diff --git a/addons/project_issue/project_feature_menu.xml b/addons/project_issue/project_feature_menu.xml
index 933a3a6112e..caf533efb7d 100644
--- a/addons/project_issue/project_feature_menu.xml
+++ b/addons/project_issue/project_feature_menu.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-    
 
-    ######################## Future Request (menu) ###########################
-    
+
+    ######################## Feature Request (menu) ###########################
+
     <record model="ir.actions.act_window" id="action_project_feature">
-        <field name="name">Future Requests</field>
+        <field name="name">Feature Requests</field>
         <field name="res_model">project.issue</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="project_issue_tree_view"/>
+        <field name="view_id" ref="project_feature_tree_view"/>
         <field name="domain" eval="[('categ_id','=',ref('feature_request_categ'))]"/>
-        <field name="search_view_id" ref="view_project_issue_filter"/>
+        <field name="search_view_id" ref="view_project_feature_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_project_feature_tree_view0">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="project_issue_tree_view"/>
+        <field name="view_id" ref="project_feature_tree_view"/>
         <field name="act_window_id" ref="action_project_feature"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_project_feature_calendar_view0">
@@ -33,6 +33,6 @@
         <field name="act_window_id" ref="action_project_feature"/>
     </record>
 
-    <menuitem name="Feature Requests" id="menu_project_issue_future_request"  parent="project.menu_project_management" action="action_project_feature"/>
+    <menuitem name="Feature Requests" id="menu_project_issue_feature_request"  parent="project.menu_project_management" action="action_project_feature"/>
 </data>
 </openerp>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 6d53c4f7036..305db272f4c 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -11,23 +11,23 @@
         <field name="name">Issue Categories</field>
         <field name="res_model">crm.case.categ</field>
         <field name="view_type">form</field>
- 		<field name="view_id" ref="crm.crm_case_categ_tree-view"/>        
+ 		<field name="view_id" ref="crm.crm_case_categ_tree-view"/>
        	<field name="domain">[('object_id.model', '=', 'project.issue')]</field>
-		<field name="context">{'object_id':'project.issue'}</field>     
+		<field name="context">{'object_id':'project.issue'}</field>
     </record>
-    # ------------------------------------------------------ 
+    # ------------------------------------------------------
 	    # Stage
-	 # ------------------------------------------------------ 
+	 # ------------------------------------------------------
 	    <record id="project_issue_stage_act" model="ir.actions.act_window">
 	        <field name="name">Issue Stages</field>
 	        <field name="res_model">crm.case.stage</field>
 	        <field name="view_type">form</field>
 	        <field name="view_id" ref="crm.crm_case_stage_tree"/>
        		<field name="domain">[('object_id.model', '=', 'project.issue')]</field>
-			<field name="context">{'object_id':'project.issue'}</field>     	        
+			<field name="context">{'object_id':'project.issue'}</field>
 	    </record>
 	  <menuitem action="project_issue_stage_act" id="menu_project_issue_stage_act" parent="crm.menu_crm_case_stage"/>
-	  
+
     <record model="ir.ui.view" id="project_issue_form_view">
         <field name="name">Project Issue Tracker Form</field>
         <field name="model">project.issue</field>
@@ -35,8 +35,8 @@
         <field name="arch" type="xml">
             <form string="Issue Tracker Form">
                 <group colspan="4" col="6">
-                    <field name="name" string="Title" colspan="2"/>                    
-                  	<field name="project_id" required="True"/>  
+                    <field name="name" string="Title" colspan="2"/>
+                  	<field name="project_id" required="True"/>
                     <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
                     <group col="3" colspan="2">
                       	<field name="task_id"/>
@@ -45,7 +45,7 @@
                          	icon="gtk-index" type="action"
                          	attrs="{'invisible':[('task_id','!=',False)]}" />
                     </group>
-                    
+
                    </group>
                    <!-- <group colspan="4" col="5">
                          <label string="" colspan="2"/>
@@ -55,19 +55,19 @@
                           <button string="Convert To Bug"
                          	name="convert_to_bug"
                          	icon="gtk-convert" type="object" attrs="{'invisible':[('categ_id','=',ref('feature_request_categ'))]}"/>
-                         
-                          
+
+
                    </group> -->
-                
+
                 <notebook colspan="4">
                 <page string="General">
                 	<separator colspan="4" string="Communication"/>
                     <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
                     <field name="partner_address_id"  string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
-                    <field name="email_from" colspan="2"/>                    
+                    <field name="email_from" colspan="2"/>
                     <separator colspan="4" string="Status and Categorization"/>
                     <group colspan="4" col="6">
-	                    <field name="type_id" string="Version"/>                    
+	                    <field name="type_id" string="Version"/>
 	                    <field name="priority" string="Severity"/>
 	                    <field name="user_id" />
 	                    <label string="Resolution: " align="1.0"/>
@@ -147,7 +147,7 @@
         </field>
     </record>
     <record model="ir.ui.view" id="project_issue_tree_view">
-        <field name="name">Proejct Issue Tracker Tree</field>
+        <field name="name">Project Issue Tracker Tree</field>
         <field name="model">project.issue</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
@@ -155,7 +155,7 @@
                 <field name="id"/>
                 <field name="name" string="Title"/>
                 <field name="partner_id"/>
-                <field name="priority" string="Severity"/>                
+                <field name="priority" string="Severity"/>
                 <field name="stage_id" string="Resolution"/>
                 <button icon="gtk-go-back" string=""
                 	name="stage_previous" type="object"
@@ -182,7 +182,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Issue Tracker Search">
-               <group col="3" colspan="1">                   
+               <group col="3" colspan="1">
                    <filter icon="gtk-home" string="   Today   "
                    	separator="1"
                    	domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
@@ -192,8 +192,8 @@
                    	string="    7 Days    " separator="1"
                    	domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                    	help="Bugs during last 7 days"
-                   />                   
-                   
+                   />
+
                </group>
                <separator orientation="vertical"/>
                <group col="5" colspan="2">
@@ -204,7 +204,7 @@
                     <field name="state" select="1">
                        <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Bugs" default="1"/>
                        <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Bugs"/>
-                    </field>                   
+                    </field>
 					<field name="project_id" select="1" widget="selection" string="Project" default="context.get('project_id', False)">
 							<filter icon="terp-crm"
                                domain="[('project_id','=',context.get('project_id',False))]"
@@ -214,7 +214,7 @@
                </group>
             </search>
          </field>
-    </record>   
+    </record>
 
      <record model="ir.ui.view" id="project_issue_calendar_view">
         <field name="name">Project Issue Tracker Calendar</field>
@@ -228,5 +228,79 @@
             </calendar>
         </field>
     </record>
+
+    # ------------------------------------------------------
+    # Feature Requests
+    # ------------------------------------------------------
+
+    <record model="ir.ui.view" id="project_feature_tree_view">
+        <field name="name">Project Issue- Feature Tracker Tree</field>
+        <field name="model">project.issue</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Feature Tracker Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                <field name="id"/>
+                <field name="name" string="Feature description"/>
+                <field name="partner_id"/>
+                <field name="priority" string="Severity"/>
+                <field name="stage_id" string="Resolution"/>
+                <button icon="gtk-go-back" string=""
+                	name="stage_previous" type="object"
+                	states="open,draft,pending,done,cancel" />
+                <button icon="gtk-go-forward" string=""
+                	name="stage_next" type="object"
+                	states="open,draft,pending,done,cancel" />
+                <field name="type_id" string="Version"/>
+                <field name="user_id"/>
+                <field name="state"/>
+                <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
+                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+            </tree>
+        </field>
+    </record>
+
+	<record id="view_project_feature_filter" model="ir.ui.view">
+        <field name="name">Project Issue- Feature Tracker Search</field>
+        <field name="model">project.issue</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Feature Tracker Search">
+               <group col="3" colspan="1">
+                   <filter icon="gtk-home" string="   Today   "
+                   	separator="1"
+                   	domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
+                   	help="Todays's features"
+                   />
+                   <filter icon="gtk-media-rewind"
+                   	string="    7 Days    " separator="1"
+                   	domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                   	help="Features during last 7 days"
+                   />
+               </group>
+               <separator orientation="vertical"/>
+               <group col="5" colspan="2">
+               		<field name="name" select='1' string="Feature description"/>
+                    <field name="user_id" select="1" widget="selection">
+                   	    <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Features" default="1"/>
+                    </field>
+                    <field name="state" select="1">
+                       <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Features" default="1"/>
+                       <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Features"/>
+                    </field>
+					<field name="project_id" select="1" widget="selection" string="Project" default="context.get('project_id', False)">
+							<filter icon="terp-crm"
+                               domain="[('project_id','=',context.get('project_id',False))]"
+                               help="My Project"
+                           />
+                    </field>
+               </group>
+            </search>
+         </field>
+    </record>
+
     </data>
 </openerp>