From 2ad6f7e1ea201f35a96b92e2569db6734a6046c6 Mon Sep 17 00:00:00 2001
From: "Hiral Patel (OpenERP)" <hip@tinyerp.com>
Date: Tue, 11 Dec 2012 11:52:06 +0530
Subject: [PATCH 1/5] [IMP] Add user_id('Responsible') fiend above 'Type of
 Event' field

bzr revid: hip@tinyerp.com-20121211062206-mf0xu6bwd9albx0i
---
 addons/event/event_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index efdbf1be3b2..6411c70a612 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -93,6 +93,7 @@
                                    </div>
                             </group>
                             <group>
+                                <field name="user_id"/>
                                 <field name="type" on_change="onchange_event_type(type,context)" />
                                 <field name="date_begin" on_change="onchange_start_date(date_begin,date_end)"/>
                                 <field name="date_end"/>

From bacf6ef1a32af7fcb0ab603e61fb28dab02f3416 Mon Sep 17 00:00:00 2001
From: "RGA(OpenERP)" <>
Date: Tue, 11 Dec 2012 16:53:01 +0530
Subject: [PATCH 2/5] [IMP] hr_holidays: Request should stay in To Approve
 until it's been approved a first time, then it should go to Second Approval

bzr revid: rgaopenerp-20121211112301-9w2uly6qus3vywb3
---
 addons/hr_holidays/hr_holidays_workflow.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
index a2e1d54f96c..b729ea54a30 100644
--- a/addons/hr_holidays/hr_holidays_workflow.xml
+++ b/addons/hr_holidays/hr_holidays_workflow.xml
@@ -77,6 +77,7 @@
     <record model="workflow.transition" id="holiday_confirm2validate1"> <!-- 2. submitted -> first_accepted (validate signal) if double_validation-->
         <field name="act_from" ref="act_confirm" />
         <field name="act_to" ref="act_validate1" />
+        <field name="signal">validate</field>
         <field name="condition">double_validation</field>
         <field name="group_id" ref="base.group_hr_user"/>
     </record>

From b41bf22384b89b5a798a92721023592abc559212 Mon Sep 17 00:00:00 2001
From: "RGA(OpenERP)" <>
Date: Tue, 11 Dec 2012 18:00:17 +0530
Subject: [PATCH 3/5] [IMP] If default filter on task: click on kanban view
 Tasks, you see the tasks with even for projects that do not contain this task
 due to default filter dominating

bzr revid: rgaopenerp-20121211123017-mon1wi9fcl6cuf57
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 853dac4e20c..5b9645bd203 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -16,7 +16,7 @@
             <field name="view_type">form</field>
             <field name="name">Tasks</field>
             <field name="view_mode">kanban,tree,form,calendar,graph</field>
-            <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id}</field>
+            <field name="domain">[('project_id','=',active_id)]</field>
         </record>
 
         <!-- Project -->

From 2b607385a99535486a37bd346f54dc1af583120f Mon Sep 17 00:00:00 2001
From: "RGA(OpenERP)" <>
Date: Fri, 14 Dec 2012 16:10:42 +0530
Subject: [PATCH 4/5] [FIX] SO -> with a popup to select a product, if you save
 & close the popup, its not possible to edit this quantity afterwards because
 of state field is readonly and it's not save in buffer dataset of o2m field
 in web

bzr revid: rgaopenerp-20121214104042-j8yjcfbiisz2pbu6
---
 addons/sale/sale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 8bab265ae3b..030cd873846 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -732,7 +732,7 @@ class sale_order_line(osv.osv):
         'product_uos': fields.many2one('product.uom', 'Product UoS'),
         'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Discount'), readonly=True, states={'draft': [('readonly', False)]}),
         'th_weight': fields.float('Weight', readonly=True, states={'draft': [('readonly', False)]}),
-        'state': fields.selection([('cancel', 'Cancelled'),('draft', 'Draft'),('confirmed', 'Confirmed'),('exception', 'Exception'),('done', 'Done')], 'Status', required=True, readonly=True,
+        'state': fields.selection([('cancel', 'Cancelled'),('draft', 'Draft'),('confirmed', 'Confirmed'),('exception', 'Exception'),('done', 'Done')], 'Status', required=True,
                 help='* The \'Draft\' status is set when the related sales order in draft status. \
                     \n* The \'Confirmed\' status is set when the related sales order is confirmed. \
                     \n* The \'Exception\' status is set when the related sales order is set as exception. \

From 0a75f29308f1294d169d81b5881fff567b6ba5c1 Mon Sep 17 00:00:00 2001
From: "RGA(OpenERP)" <>
Date: Fri, 14 Dec 2012 18:52:18 +0530
Subject: [PATCH 5/5] revert last commit, commited in wronge branch

bzr revid: rgaopenerp-20121214132218-a11pf698y1g4yqjj
---
 addons/sale/sale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 030cd873846..8bab265ae3b 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -732,7 +732,7 @@ class sale_order_line(osv.osv):
         'product_uos': fields.many2one('product.uom', 'Product UoS'),
         'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Discount'), readonly=True, states={'draft': [('readonly', False)]}),
         'th_weight': fields.float('Weight', readonly=True, states={'draft': [('readonly', False)]}),
-        'state': fields.selection([('cancel', 'Cancelled'),('draft', 'Draft'),('confirmed', 'Confirmed'),('exception', 'Exception'),('done', 'Done')], 'Status', required=True,
+        'state': fields.selection([('cancel', 'Cancelled'),('draft', 'Draft'),('confirmed', 'Confirmed'),('exception', 'Exception'),('done', 'Done')], 'Status', required=True, readonly=True,
                 help='* The \'Draft\' status is set when the related sales order in draft status. \
                     \n* The \'Confirmed\' status is set when the related sales order is confirmed. \
                     \n* The \'Exception\' status is set when the related sales order is set as exception. \