From 790bbfd9e785381c47cc7fa9a6f4ea6c1ff9c0a2 Mon Sep 17 00:00:00 2001
From: Saurang Suthar <ssu@tinyerp.com>
Date: Mon, 12 Nov 2012 12:07:20 +0530
Subject: [PATCH 1/7] [IMP]hr_holidays:replaced filter Start Date by
 Description

bzr revid: ssu@tinyerp.com-20121112063720-p5964m4smclz9n1d
---
 addons/hr_holidays/hr_holidays_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index ef300741139..8b49be562fe 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -43,7 +43,7 @@
             <field name="model">hr.holidays</field>
             <field name="arch" type="xml">
                 <search string="Search Leave">
-                    <field name="date_from"/>
+                    <field name="name"/>
                     <separator/>
                     <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
                     <filter icon="terp-camera_test" domain="[('state','in',('confirm','validate1'))]" string="To Approve" name="approve"/>
@@ -58,7 +58,7 @@
                     <field name="department_id"/>
                     <field name="holiday_status_id"/>
                     <group expand="0" string="Group By...">
-                        <filter name="group_date_from" string="Start Date" icon="terp-personal" domain="[]" context="{'group_by':'date_from'}"/>
+                        <filter name="group_name" string="Description" domain="[]" context="{'group_by':'name'}"/>
                         <filter name="group_employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter name="group_category" string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>

From fff55c47e017459aa1149d73c9958136f20ea031 Mon Sep 17 00:00:00 2001
From: Saurang Suthar <ssu@tinyerp.com>
Date: Mon, 12 Nov 2012 12:30:47 +0530
Subject: [PATCH 2/7] [IMP]hr_timesheet:chenged sequence of columns in tree
 view of Timesheet Activities

bzr revid: ssu@tinyerp.com-20121112070047-ulir5krh93l4zwlo
---
 addons/hr_timesheet/hr_timesheet_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index ebdd05ed59c..20e881cd9da 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -7,13 +7,13 @@
             <field name="model">hr.analytic.timesheet</field>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Timesheet Activities">
+                    <field name="name"/>
+                    <field name="unit_amount" string="Duration" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" sum="Total time" widget="float_time"/>
+                    <field domain="[('type','=','normal'),('use_timesheets','=',1)]" name="account_id" context="{'default_use_timesheets': 1, 'default_type': 'contract'}"/>
                     <field name="date" on_change="on_change_date(date)"/>
                     <field name="user_id" on_change="on_change_user_id(user_id)" required="1" options='{"no_open": True}'/>
                     <field name="journal_id" invisible="1"/>
-                    <field name="name"/>
-                    <field domain="[('type','=','normal'),('use_timesheets','=',1)]" name="account_id" context="{'default_use_timesheets': 1, 'default_type': 'contract'}"/>
                     <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]" invisible="1"/>
-                    <field name="unit_amount" string="Duration" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" sum="Total time" widget="float_time"/>
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" invisible="1"/>
                     <field name="amount" sum="Total cost" invisible="1"/>
                     <field name="general_account_id" invisible="1"/>

From 951844a151aece177d2ff6ceddfa843bbba9d132 Mon Sep 17 00:00:00 2001
From: Saurang Suthar <ssu@tinyerp.com>
Date: Mon, 12 Nov 2012 14:38:22 +0530
Subject: [PATCH 3/7] [IMP]hr_evaluation:overwrite copy method to avoid
 duplicating o2m field in Appraisal Form

bzr revid: ssu@tinyerp.com-20121112090822-0ernxqxolou10w9o
---
 addons/hr_evaluation/hr_evaluation.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index eece0c7497e..ac7d110f8fa 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -265,6 +265,15 @@ class hr_evaluation(osv.osv):
         self.write(cr, uid, ids,{'state': 'draft'}, context=context)
         return True
 
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        if context is None:
+            context = {}
+        default = default.copy()
+        default['survey_request_ids'] = []
+        return super(hr_evaluation, self).copy(cr, uid, id, default, context=context)
+    
     def write(self, cr, uid, ids, vals, context=None):
         if vals.get('employee_id'):
             employee_id = self.pool.get('hr.employee').browse(cr, uid, vals.get('employee_id'), context=context)

From 3f0b7feb2184e06027fe39336c42d366513b9dde Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 16 Nov 2012 12:20:05 +0530
Subject: [PATCH 4/7] [FIX]: Add date_From group by

bzr revid: atp@tinyerp.com-20121116065005-uecsl54sfbilp4o7
---
 addons/hr_holidays/hr_holidays_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index c9ebc43dfb7..934985068d3 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -59,6 +59,7 @@
                     <field name="holiday_status_id"/>
                     <group expand="0" string="Group By...">
                         <filter name="group_name" string="Description" domain="[]" context="{'group_by':'name'}"/>
+                        <filter name="group_date_from" string="Start Date" icon="terp-personal" domain="[]" context="{'group_by':'date_from'}"/>
                         <filter name="group_employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter name="group_category" string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>

From 28a31cd664ebdfad491544f0e38e34841116d3d8 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Wed, 21 Nov 2012 16:44:46 +0530
Subject: [PATCH 5/7] [FIX] search by date.

bzr revid: nco@tinyerp.com-20121121111446-5u8mh0i8e39uncf7
---
 addons/hr_holidays/hr_holidays_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 934985068d3..4135f9ee24e 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -43,6 +43,7 @@
             <field name="model">hr.holidays</field>
             <field name="arch" type="xml">
                 <search string="Search Leave">
+                    <field name="date_from" filter_domain="[('date_from', '>=', self)]"/>
                     <field name="name"/>
                     <separator/>
                     <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>

From d212d7b037be93f58213333abdcfd236a35c7f7a Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Mon, 10 Dec 2012 18:51:47 +0530
Subject: [PATCH 6/7] [REMOVE] filter date from.

bzr revid: nco@tinyerp.com-20121210132147-t0sm2vipu7jltn9r
---
 addons/hr_holidays/hr_holidays_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 66986989260..f8b4ad07b77 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -6,7 +6,6 @@
             <field name="model">hr.holidays</field>
             <field name="arch" type="xml">
                 <search string="Search Leave">
-                    <field name="date_from" filter_domain="[('date_from', '>=', self)]"/>
                     <field name="name"/>
                     <separator/>
                     <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>

From bd365fca74becfd2da57d96f901ffadc1a6e9acd Mon Sep 17 00:00:00 2001
From: "dle@openerp.com" <>
Date: Fri, 14 Dec 2012 12:14:32 +0100
Subject: [PATCH 7/7] [FIX]hr analytic timesheet view

bzr revid: dle@openerp.com-20121214111432-2b5rynpl75gh342s
---
 addons/hr_timesheet/hr_timesheet_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 2d733c6e6cb..6edd2a74eea 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -6,17 +6,17 @@
             <field name="name">hr.analytic.timesheet.tree</field>
             <field name="model">hr.analytic.timesheet</field>
             <field name="arch" type="xml">
-                <tree editable="top" string="Timesheet Activities">
-                    <field name="name"/>
-                    <field name="unit_amount" string="Duration" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" sum="Total time" widget="float_time"/>
-                    <field domain="[('type','=','normal'),('use_timesheets','=',1)]" name="account_id" context="{'default_use_timesheets': 1, 'default_type': 'contract'}"/>
+                <tree editable="top" string="Timesheet Activities">                  
                     <field name="date" on_change="on_change_date(date)"/>
                     <field name="user_id" on_change="on_change_user_id(user_id)" required="1" options='{"no_open": True}'/>
-                    <field name="journal_id" invisible="1"/>
-                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]" invisible="1"/>
+                    <field name="name"/>
+                    <field domain="[('type','=','normal'),('use_timesheets','=',1)]" name="account_id" context="{'default_use_timesheets': 1, 'default_type': 'contract'}"/>
+                    <field name="unit_amount" string="Duration" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" sum="Total time" widget="float_time"/>
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" invisible="1"/>
+                    <field name="journal_id" invisible="1"/>
                     <field name="amount" sum="Total cost" invisible="1"/>
                     <field name="general_account_id" invisible="1"/>
+                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]" invisible="1"/>
                 </tree>
             </field>
         </record>