From 0555a1f10c87e2f0d71b3d3c4a2e574a8f57eada Mon Sep 17 00:00:00 2001
From: "Hiral Patel (OpenERP)" <hip@tinyerp.com>
Date: Wed, 5 Dec 2012 17:38:50 +0530
Subject: [PATCH 01/31] [FIX][trunk] stock - Error in new company

bzr revid: hip@tinyerp.com-20121205120850-y2ob7y6a2bk3956f
---
 addons/stock/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 84b475adf1d..2f93bfee3c6 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -62,3 +62,4 @@ access_product_pricelist_version_stock_manager,product.pricelist.version stock_m
 access_product_pricelist_item_stock_manager,product.pricelist.item stock_manager,product.model_product_pricelist_item,stock.group_stock_manager,1,1,1,1
 access_account_account_stock_manager,account.account stock manager,account.model_account_account,stock.group_stock_manager,1,0,0,0
 access_board_stock_user,board.board user,board.model_board_board,stock.group_stock_user,1,1,0,0
+access_stock_warehouse_salesman,stock.warehouse,stock.model_stock_warehouse,base.group_sale_salesman,1,0,0,0
\ No newline at end of file

From 3bab853d8e5cef32b1ddca94e18ac4799b724993 Mon Sep 17 00:00:00 2001
From: "Hiral Patel (OpenERP)" <hip@tinyerp.com>
Date: Wed, 12 Dec 2012 11:52:33 +0530
Subject: [PATCH 02/31] [Rev] Revert the unwanted commit

bzr revid: hip@tinyerp.com-20121212062233-ajnbznvn0bhxsrsn
---
 addons/stock/security/ir.model.access.csv | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 2f93bfee3c6..84b475adf1d 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -62,4 +62,3 @@ access_product_pricelist_version_stock_manager,product.pricelist.version stock_m
 access_product_pricelist_item_stock_manager,product.pricelist.item stock_manager,product.model_product_pricelist_item,stock.group_stock_manager,1,1,1,1
 access_account_account_stock_manager,account.account stock manager,account.model_account_account,stock.group_stock_manager,1,0,0,0
 access_board_stock_user,board.board user,board.model_board_board,stock.group_stock_user,1,1,0,0
-access_stock_warehouse_salesman,stock.warehouse,stock.model_stock_warehouse,base.group_sale_salesman,1,0,0,0
\ No newline at end of file

From 72024d0fe51f5150ff5890047ad8387cff9288b8 Mon Sep 17 00:00:00 2001
From: "Hiral Patel (OpenERP)" <hip@tinyerp.com>
Date: Wed, 12 Dec 2012 11:59:32 +0530
Subject: [PATCH 03/31] [FIX][trunk] stock - Error in new company

bzr revid: hip@tinyerp.com-20121212062932-aijgsk27m0sl1qv5
---
 addons/stock/product.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index 4d955495c28..abd74fb3a97 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -235,6 +235,8 @@ class product_product(osv.osv):
         else:
             location_ids = []
             wids = warehouse_obj.search(cr, uid, [], context=context)
+            if not wids:
+                return res
             for w in warehouse_obj.browse(cr, uid, wids, context=context):
                 location_ids.append(w.lot_stock_id.id)
 

From 9fc52399a869fcbc4b3b0cb9ed747bf0e7d70cd0 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 13 Dec 2012 13:02:37 +0530
Subject: [PATCH 04/31] [IMP] uom_id was passed instead of uom.

bzr revid: psa@tinyerp.com-20121213073237-2fm642lm2n6md4hg
---
 addons/sale/wizard/sale_make_invoice_advance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 0fa4cd52cf2..338118679de 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -78,7 +78,7 @@ class sale_advance_payment_inv(osv.osv_memory):
         result = []
         for sale in sale_obj.browse(cr, uid, sale_ids, context=context):
             val = inv_line_obj.product_id_change(cr, uid, [], wizard.product_id.id,
-                    uom_id=False, partner_id=sale.partner_id.id, fposition_id=sale.fiscal_position.id)
+                    uom=False, partner_id=sale.partner_id.id, fposition_id=sale.fiscal_position.id)
             res = val['value']
 
             # determine and check income account

From e9a355f840462b003402538b58e0ee0989eade4d Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 13 Dec 2012 16:23:31 +0530
Subject: [PATCH 05/31] [IMP] sale.fiscal_position.id was passed instead of
 sale.fiscal_position.

bzr revid: psa@tinyerp.com-20121213105331-77v6x57l3vzb7114
---
 addons/sale/wizard/sale_make_invoice_advance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 338118679de..c9eff5e9c6a 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -86,7 +86,7 @@ class sale_advance_payment_inv(osv.osv_memory):
                 prop = ir_property_obj.get(cr, uid,
                             'property_account_income_categ', 'product.category', context=context)
                 prop_id = prop and prop.id or False
-                account_id = fiscal_obj.map_account(cr, uid, sale.fiscal_position.id or False, prop_id)
+                account_id = fiscal_obj.map_account(cr, uid, sale.fiscal_position or False, prop_id)
                 if not account_id:
                     raise osv.except_osv(_('Configuration Error!'),
                             _('There is no income account defined as global property.'))

From 04de836f078a6168732e59165c0bf7ed75a0f2fc Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 13 Dec 2012 17:06:49 +0530
Subject: [PATCH 06/31] [IMP] Improved code.

bzr revid: psa@tinyerp.com-20121213113649-04rhxk61gmcys4o3
---
 addons/sale/wizard/sale_make_invoice_advance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index c9eff5e9c6a..006f27eb168 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -78,7 +78,7 @@ class sale_advance_payment_inv(osv.osv_memory):
         result = []
         for sale in sale_obj.browse(cr, uid, sale_ids, context=context):
             val = inv_line_obj.product_id_change(cr, uid, [], wizard.product_id.id,
-                    uom=False, partner_id=sale.partner_id.id, fposition_id=sale.fiscal_position.id)
+                    uom_id=False, partner_id=sale.partner_id.id, fposition_id=sale.fiscal_position.id)
             res = val['value']
 
             # determine and check income account

From 45f013603ffe691524aaf497e20e0af45f1b876b Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Tue, 18 Dec 2012 17:09:44 +0530
Subject: [PATCH 07/31] [IMP] Remove wrong argument.

bzr revid: bth@tinyerp.com-20121218113944-38ul57xiyzuqxzjh
---
 addons/sale/wizard/sale_make_invoice_advance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 9d481296ed0..0d5a8e4eb18 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -78,7 +78,7 @@ class sale_advance_payment_inv(osv.osv_memory):
         result = []
         for sale in sale_obj.browse(cr, uid, sale_ids, context=context):
             val = inv_line_obj.product_id_change(cr, uid, [], wizard.product_id.id,
-                    uom_id=False, partner_id=sale.partner_id.id, fposition_id=sale.fiscal_position.id)
+                    False, partner_id=sale.partner_id.id, fposition_id=sale.fiscal_position.id)
             res = val['value']
 
             # determine and check income account

From 5a025f16a76580cdc6017808aef13c588318bb79 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Fri, 18 Jan 2013 13:14:54 +0530
Subject: [PATCH 08/31] [IMP] Added User field in Lunch Order List.

bzr revid: tta@openerp.com-20130118074454-k2nq4xkq36se21bb
---
 addons/lunch/lunch_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 8974099a294..f38a8701f02 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -303,6 +303,7 @@
             <field name="arch" type="xml">
                 <tree string="Orders Tree">
                     <field name="date"/>
+                    <field name='user_id'/>
                     <field name="order_line_ids"/>
                     <field name="state" />
                     <field name="total" sum="Total"/>

From 4d328d0d9529a8ef189046764ce5339c41c8e92b Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Fri, 18 Jan 2013 14:54:43 +0530
Subject: [PATCH 09/31] [IMP] Search enhanced by adding group by users.

bzr revid: tta@openerp.com-20130118092443-eglo7fyjs3qj37ls
---
 addons/lunch/lunch_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index f38a8701f02..99a6eb140e5 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -68,6 +68,7 @@
                     <field name="date"/>
                     <field name="order_line_ids"/>
                     <filter name='is_mine' string="My Orders" domain="[('user_id','=',uid)]"/>
+                    <filter name='by_users' string="Users" context="{'group_by':'user_id'}"/>
                 </search>
             </field>
         </record>

From 34531d70b399c477cefb2c1056d37e08f204b9ff Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Fri, 18 Jan 2013 18:18:32 +0530
Subject: [PATCH 10/31] [Fix]replace Mode column by Leave Type column in Human
 Resources => Leaves => Leave Requests and Leave Requests to Approve

bzr revid: vja@tinyerp.com-20130118124832-wvsz09lpy76z704o
---
 addons/hr_holidays/hr_holidays_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index f8b4ad07b77..d8ff3e23239 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -206,7 +206,7 @@
             <field name="arch" type="xml">
                 <tree colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leave Requests">
                     <field name="employee_id"/>
-                    <field name="holiday_type" string="Mode" groups="base.group_hr_user"/>
+                    <field name="holiday_status_id"/>
                     <field name="name"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
@@ -214,7 +214,6 @@
                     <field name="state"/>
                     <field name="category_id" invisible="1"/>
                     <field name="department_id" invisible="not context.get('set_visible',False)"/>
-                    <field name="holiday_status_id" invisible="1"/>
                     <field name="manager_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                 </tree>

From da9033dcb5a0ffaf1a9a8916fce55215231b6ccb Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Mon, 28 Jan 2013 10:52:23 +0530
Subject: [PATCH 11/31] [Fix]in the employee form put a chatter,to say that the
 document is created

bzr revid: vja@tinyerp.com-20130128052223-3j6gnpe5o0hu573s
---
 addons/hr/hr.py       | 1 +
 addons/hr/hr_view.xml | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 92bde22086e..4ec04b6ce6a 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -146,6 +146,7 @@ class hr_employee(osv.osv):
     _name = "hr.employee"
     _description = "Employee"
     _inherits = {'resource.resource': "resource_id"}
+    _inherit = ['mail.thread']
 
     def _get_image(self, cr, uid, ids, name, args, context=None):
         result = dict.fromkeys(ids, False)
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index dc65fa80e8b..8767da6bd63 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -84,6 +84,10 @@
                             </page>
                         </notebook>
                     </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
                 </form>
             </field>
         </record>

From 6d9b41b3bf0a99e699f7fc0670129120c5c6e1d4 Mon Sep 17 00:00:00 2001
From: "Hiral Patel (OpenERP)" <hip@tinyerp.com>
Date: Thu, 31 Jan 2013 15:23:36 +0530
Subject: [PATCH 12/31] [IMP] Improve the code

bzr revid: hip@tinyerp.com-20130131095336-317ww7oe391tg2wk
---
 addons/stock/product.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index 1d56ce64988..ba855e0409b 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -235,10 +235,10 @@ class product_product(osv.osv):
         else:
             location_ids = []
             wids = warehouse_obj.search(cr, uid, [], context=context)
-            if not wids:
-                return res
             for w in warehouse_obj.browse(cr, uid, wids, context=context):
                 location_ids.append(w.lot_stock_id.id)
+            else:
+                return res
 
         # build the list of ids of children of the location given by id
         if context.get('compute_child',True):

From 3a614884ccfef322a022543ac0c55db71cd98880 Mon Sep 17 00:00:00 2001
From: "Hiral Patel (OpenERP)" <hip@tinyerp.com>
Date: Thu, 31 Jan 2013 16:40:36 +0530
Subject: [PATCH 13/31] [REV] Revert the changes

bzr revid: hip@tinyerp.com-20130131111036-picfcuvfq4zhjk0m
---
 addons/stock/product.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index ba855e0409b..1d56ce64988 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -235,10 +235,10 @@ class product_product(osv.osv):
         else:
             location_ids = []
             wids = warehouse_obj.search(cr, uid, [], context=context)
+            if not wids:
+                return res
             for w in warehouse_obj.browse(cr, uid, wids, context=context):
                 location_ids.append(w.lot_stock_id.id)
-            else:
-                return res
 
         # build the list of ids of children of the location given by id
         if context.get('compute_child',True):

From 026e53d27a4dbd4fe48c6a95bffc2ecdc6e4e31d Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Mon, 11 Feb 2013 16:27:01 +0530
Subject: [PATCH 14/31] [IMP] [Leaves] Context problem: creating a leave from
 the employee form.

bzr revid: tta@openerp.com-20130211105701-gzl5vsmx01ckdled
---
 addons/hr_holidays/hr_holidays.py       | 11 +++++++----
 addons/hr_holidays/hr_holidays_view.xml |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index c7d7867911d..11b3cef41cd 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -117,7 +117,10 @@ class hr_holidays(osv.osv):
         },
     }
 
-    def _employee_get(self, cr, uid, context=None):
+    def _employee_get(self, cr, uid, context=None):        
+        emp_id = context.get('default_employee_id', False)
+        if emp_id:
+            return emp_id
         ids = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
         if ids:
             return ids[0]
@@ -204,9 +207,9 @@ class hr_holidays(osv.osv):
         leave_ids = obj_res_leave.search(cr, uid, [('holiday_id', 'in', ids)], context=context)
         return obj_res_leave.unlink(cr, uid, leave_ids, context=context)
 
-    def onchange_type(self, cr, uid, ids, holiday_type):
-        result = {'value': {'employee_id': False}}
-        if holiday_type == 'employee':
+    def onchange_type(self, cr, uid, ids, holiday_type, employee_id):
+        result = {}
+        if holiday_type == 'employee' and not employee_id:
             ids_employee = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
             if ids_employee:
                 result['value'] = {
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index f8b4ad07b77..041094c5999 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -78,7 +78,7 @@
                             <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
                         </group>
                         <group>
-                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
+                            <field name="holiday_type" on_change="onchange_type(holiday_type, employee_id)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
                             <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" on_change="onchange_employee(employee_id)" groups="base.group_hr_user"/>
                             <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                         </group>

From fd7ed1b8cd452636c772337b5beaac935e71b224 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Thu, 14 Feb 2013 17:37:28 +0530
Subject: [PATCH 15/31] [FIX] Re-Enabled currency button feature for invoices.

bzr revid: tta@openerp.com-20130214120728-xncs05o9pmc6618c
---
 addons/account/account_invoice_view.xml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 6cca8e0ce46..047f19bd791 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -184,7 +184,14 @@
                                 name="account_id" groups="account.group_account_user"/>
                             <field name="journal_id" groups="account.group_account_user"
                                 on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
-                            <field name="currency_id" groups="base.group_multi_currency"/>
+                            <label for="currency_id" groups="base.group_multi_currency"/>
+                            <div groups="base.group_multi_currency">
+                                <field name="currency_id" class="oe_inline" readonly="1"/>
+                                <button name="223" type="action" class="oe_inline oe_link oe_edit_only" 
+                                    string="(change)" 
+                                    attrs="{'invisible':[('state','!=','draft')]}" 
+                                    groups="account.group_account_user"/>
+                            </div>
                             <field name="check_total" groups="account.group_supplier_inv_check_total"/>
                         </group>
                     </group>
@@ -333,12 +340,12 @@
 
                             <label for="currency_id" groups="base.group_multi_currency"/>
                             <div groups="base.group_multi_currency">
-                                <field name="currency_id" class="oe_inline"/>
-                                <!-- note fp: I don't think we need this feature ?
-                                <button name="%(action_account_change_currency)d" type="action"
-                                  icon="terp-stock_effects-object-colorize"
+                                <field name="currency_id" class="oe_inline" readonly="1"/>
+                                <button name="%(action_account_change_currency)d" type="action" 
+                                  class="oe_inline oe_link oe_edit_only"
+                                  string="(change)"
                                   attrs="{'invisible':[('state','!=','draft')]}"
-                                  groups="account.group_account_user"/> -->
+                                  groups="account.group_account_user"/>
                             </div>
                         </group>
                     </group>

From e6b5ec6061c37fa25be166a4b251538601bcc57e Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Thu, 14 Feb 2013 18:29:27 +0530
Subject: [PATCH 16/31] [IMP]Improve code for hr_timesheet

bzr revid: vja@tinyerp.com-20130214125927-2dzdu7wxygfy56bc
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index d4e71cedbf5..76175761651 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -253,6 +253,17 @@ class account_analytic_line(osv.osv):
 class hr_timesheet_line(osv.osv):
     _inherit = "hr.analytic.timesheet"
 
+    def create(self, cr, uid, vals, *args, **argv):
+        sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
+        print"this >>>>>>>>>>>>>>>>>>>>>>>>",vals,sheet_obj.search(cr, uid,[('date_to', '>=', vals['date']), ('date_from', '<=', vals['date'])])
+        idss = sheet_obj.search(cr, uid,[('date_to', '>=', vals['date']), ('date_from', '<=', vals['date'])])
+        print"this 123 >>>>>>>>>>>>>>>>>>>>>>>>",idss
+        if not idss or len(idss) < 1 :
+            res = sheet_obj.default_get(cr, uid, ['date_from','date_to','employee_id','company_id','state'], context=None)
+            ids = sheet_obj.create(cr, uid, res, context=None)
+            print"this >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>...343424",ids,res
+        return super(hr_timesheet_line, self).create(cr, uid, vals, *args, **argv)
+
     def _sheet(self, cursor, user, ids, name, args, context=None):
         sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
         res = {}.fromkeys(ids, False)

From b1e5352939fc8cdbca7f6b4f1275cdf9b21b18fa Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Thu, 14 Feb 2013 19:03:20 +0530
Subject: [PATCH 17/31] [Fix]Improve code

bzr revid: vja@tinyerp.com-20130214133320-5ce378028he51jds
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 76175761651..1247ed6166b 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -253,7 +253,7 @@ class account_analytic_line(osv.osv):
 class hr_timesheet_line(osv.osv):
     _inherit = "hr.analytic.timesheet"
 
-    def create(self, cr, uid, vals, *args, **argv):
+    def create_timesheet(self, cr, uid, vals,context=None):
         sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
         print"this >>>>>>>>>>>>>>>>>>>>>>>>",vals,sheet_obj.search(cr, uid,[('date_to', '>=', vals['date']), ('date_from', '<=', vals['date'])])
         idss = sheet_obj.search(cr, uid,[('date_to', '>=', vals['date']), ('date_from', '<=', vals['date'])])
@@ -272,9 +272,10 @@ class hr_timesheet_line(osv.osv):
                 [('date_to', '>=', ts_line.date), ('date_from', '<=', ts_line.date),
                  ('employee_id.user_id', '=', ts_line.user_id.id)],
                 context=context)
-            if sheet_ids:
+            if not sheet_ids:
+                sheet_ids = self.create_timesheet(cursor,user,ts_line,context=context)
             # [0] because only one sheet possible for an employee between 2 dates
-                res[ts_line.id] = sheet_obj.name_get(cursor, user, sheet_ids, context=context)[0]
+            res[ts_line.id] = sheet_obj.name_get(cursor, user, sheet_ids, context=context)[0]
         return res
 
     def _get_hr_timesheet_sheet(self, cr, uid, ids, context=None):

From 05e1a581c0ef1865d4c8abbf62c43d098587c92c Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Fri, 15 Feb 2013 11:12:33 +0530
Subject: [PATCH 18/31] [Fix]Improve code

bzr revid: vja@tinyerp.com-20130215054233-lryxtaycngg474ck
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 1247ed6166b..215f2ba8cfd 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -262,7 +262,7 @@ class hr_timesheet_line(osv.osv):
             res = sheet_obj.default_get(cr, uid, ['date_from','date_to','employee_id','company_id','state'], context=None)
             ids = sheet_obj.create(cr, uid, res, context=None)
             print"this >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>...343424",ids,res
-        return super(hr_timesheet_line, self).create(cr, uid, vals, *args, **argv)
+        return [ids]
 
     def _sheet(self, cursor, user, ids, name, args, context=None):
         sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')

From c9e149d1e7074b4889949e0e3ed7bdfb38e3b801 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Fri, 15 Feb 2013 11:13:14 +0530
Subject: [PATCH 19/31] [IMP] Removed readonly flag.

bzr revid: tta@openerp.com-20130215054314-alk8pigxhtt3lciv
---
 addons/account/account_invoice_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 047f19bd791..d730211d8d0 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -186,7 +186,7 @@
                                 on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
                             <label for="currency_id" groups="base.group_multi_currency"/>
                             <div groups="base.group_multi_currency">
-                                <field name="currency_id" class="oe_inline" readonly="1"/>
+                                <field name="currency_id" class="oe_inline"/>
                                 <button name="223" type="action" class="oe_inline oe_link oe_edit_only" 
                                     string="(change)" 
                                     attrs="{'invisible':[('state','!=','draft')]}" 
@@ -340,7 +340,7 @@
 
                             <label for="currency_id" groups="base.group_multi_currency"/>
                             <div groups="base.group_multi_currency">
-                                <field name="currency_id" class="oe_inline" readonly="1"/>
+                                <field name="currency_id" class="oe_inline"/>
                                 <button name="%(action_account_change_currency)d" type="action" 
                                   class="oe_inline oe_link oe_edit_only"
                                   string="(change)"

From 31f6d8a0245fd24a698ef0739f55983db6f53103 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Fri, 15 Feb 2013 11:44:23 +0530
Subject: [PATCH 20/31] [Fix]Improve code

bzr revid: vja@tinyerp.com-20130215061423-a9h1evhxxg1513z8
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 215f2ba8cfd..d67d0e7594a 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -262,7 +262,8 @@ class hr_timesheet_line(osv.osv):
             res = sheet_obj.default_get(cr, uid, ['date_from','date_to','employee_id','company_id','state'], context=None)
             ids = sheet_obj.create(cr, uid, res, context=None)
             print"this >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>...343424",ids,res
-        return [ids]
+            return ids
+        return idss
 
     def _sheet(self, cursor, user, ids, name, args, context=None):
         sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')

From 13ad2658640fb65b054061b99aea556a7c7ec843 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Fri, 15 Feb 2013 12:12:48 +0530
Subject: [PATCH 21/31] [Fix]in the absence of an Applicant's Name, employee
 should take first contact name and then take subject name as applicant name

bzr revid: vja@tinyerp.com-20130215064248-j206q2aw2g8ainir
---
 addons/hr_recruitment/hr_recruitment.py         |  5 +++--
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 13 +++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 5700a07f519..329f3ddc600 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -420,12 +420,13 @@ class hr_applicant(base_stage, osv.Model):
         act_window = self.pool.get('ir.actions.act_window')
         emp_id = False
         for applicant in self.browse(cr, uid, ids, context=context):
-            address_id = False
+            address_id = contact_name = False
             if applicant.partner_id:
                 address_id = self.pool.get('res.partner').address_get(cr,uid,[applicant.partner_id.id],['contact'])['contact']
+                contact_name = self.pool.get('res.partner').name_get(cr,uid,[applicant.partner_id.id])[0][1]
             if applicant.job_id:
                 applicant.job_id.write({'no_of_recruitment': applicant.job_id.no_of_recruitment - 1})
-                emp_id = hr_employee.create(cr,uid,{'name': applicant.partner_name or applicant.name,
+                emp_id = hr_employee.create(cr,uid,{'name': applicant.partner_name or contact_name or applicant.name,
                                                      'job_id': applicant.job_id.id,
                                                      'address_home_id': address_id,
                                                      'department_id': applicant.department_id.id
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index d67d0e7594a..e508a5b347a 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -255,15 +255,12 @@ class hr_timesheet_line(osv.osv):
 
     def create_timesheet(self, cr, uid, vals,context=None):
         sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
-        print"this >>>>>>>>>>>>>>>>>>>>>>>>",vals,sheet_obj.search(cr, uid,[('date_to', '>=', vals['date']), ('date_from', '<=', vals['date'])])
-        idss = sheet_obj.search(cr, uid,[('date_to', '>=', vals['date']), ('date_from', '<=', vals['date'])])
-        print"this 123 >>>>>>>>>>>>>>>>>>>>>>>>",idss
-        if not idss or len(idss) < 1 :
+        sheet_ids = sheet_obj.search(cr, uid,[('date_to', '>=', vals['date']), ('date_from', '<=', vals['date'])])
+        if not sheet_ids or len(sheet_ids) < 1 :
             res = sheet_obj.default_get(cr, uid, ['date_from','date_to','employee_id','company_id','state'], context=None)
-            ids = sheet_obj.create(cr, uid, res, context=None)
-            print"this >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>...343424",ids,res
-            return ids
-        return idss
+            id = sheet_obj.create(cr, uid, res, context=None)
+            return id
+        return sheet_ids
 
     def _sheet(self, cursor, user, ids, name, args, context=None):
         sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')

From 3222e81ef687c88237af4171a656b24c874d4bd9 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Wed, 20 Feb 2013 16:11:04 +0530
Subject: [PATCH 22/31] [IMP]Improve product actions

bzr revid: vja@tinyerp.com-20130220104104-91l7ox1rie02ap3p
---
 .../account_analytic_default_view.xml         | 24 ++++++++-----
 addons/mrp/mrp_view.xml                       | 36 ++++++++-----------
 .../wizard/product_margin_view.xml            | 26 +++++++++-----
 addons/purchase/purchase_view.xml             | 20 +++++------
 addons/sale/sale_view.xml                     | 25 ++++++++-----
 addons/stock/product_view.xml                 |  4 +++
 addons/stock/report/report_stock_view.xml     |  7 ----
 addons/stock/stock_view.xml                   | 25 ++++++-------
 8 files changed, 86 insertions(+), 81 deletions(-)

diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index ff09fb4b0db..d2b6a13d046 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -68,6 +68,22 @@
             <field name="search_view_id" ref="view_account_analytic_default_form_search"/>
             <field name="context">{"search_default_current":1}</field>
         </record>
+        
+        <record id="action_product_default_list" model="ir.actions.act_window">
+            <field name="name">Analytic Defaults</field>
+            <field name="res_model">account.analytic.default</field>
+            <field name="context">{'search_default_product_id': [active_id], 'default_product_id': active_id}</field>
+        </record>
+        <record model="ir.ui.view" id="product_form_view_default_analytic_button">
+            <field name="name">product.product.stock.move</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button string="Analytic Rules" name= "%(action_product_default_list)d" type="action" groups="analytic.group_analytic_accounting" />
+                </xpath>
+            </field>
+        </record>
 
         <act_window
             name="Entries"
@@ -99,13 +115,5 @@
             context="{'search_default_user_id': [active_id], 'default_user_id': active_id}"
             groups="analytic.group_analytic_accounting"/>
 
-        <act_window
-            name="Analytic Rules"
-            res_model="account.analytic.default"
-            id="analytic_rule_action_product"
-            src_model="product.product"
-            context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
-            groups="analytic.group_analytic_accounting"/>
-
     </data>
 </openerp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 00e8369e6b7..02d7945fd29 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -980,26 +980,6 @@
             </field>
         </record>
 
-        <act_window
-            context="{'search_default_product_id': [active_id]}"
-            id="act_product_manufacturing_open"
-            name="Manufacturing Orders"
-            view_id="mrp_production_tree_view"
-            res_model="mrp.production"
-            src_model="product.product"/>
-
-        <act_window
-            id="action_product_bom_structure"
-            name="Product BoM Structure"
-            domain="[('product_id', 'in', active_ids),('bom_id','=',False)]"
-            context="{'default_product_id': active_id}"
-            view_type="tree"
-            view_mode="tree"
-            view_id="mrp_bom_tree_view"
-            res_model="mrp.bom"
-            src_model="product.product"
-            groups="mrp.group_mrp_user"/>
-
         <!-- Menu for Resource for MRP-->
 
         <record id="mrp_workcenter_action" model="ir.actions.act_window">
@@ -1034,14 +1014,24 @@
                 id="menu_mrp_production_order_action" name="Order Planning"
                 parent="menu_mrp_planning" sequence="1"/>
 
-
+        <record id="act_product_mrp_bom_open" model="ir.actions.act_window">
+            <field name="name">Product BoM Structure</field>
+            <field name="context">{'default_product_id': active_id}</field>
+            <field name="domain">[('product_id', 'in', active_ids),('bom_id','=',False)]</field>
+            <field name="res_model">mrp.bom</field>
+        </record>
         <record model="ir.actions.act_window" id="product_open_bom">
             <field name="context">{'default_product_id': active_id, 'search_default_product_id': active_id}</field>
             <field name="name">Bill of Materials</field>
             <field name="domain">[('bom_id','=',False)]</field>
             <field name="res_model">mrp.bom</field>
         </record>
-
+        <record id="act_product_mrp_production" model="ir.actions.act_window">
+            <field name="context">{'search_default_product_id': [active_id]}</field>
+            <field name="name">Manufacturing Orders</field>
+            <field name="res_model">mrp.production</field>
+            <field name="view_id" ref="mrp_production_tree_view"/>
+        </record>
         <record model="ir.ui.view" id="product_form_view_bom_button">
             <field name="name">product.product.procurement</field>
             <field name="model">product.product</field>
@@ -1049,6 +1039,8 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button string="Bill of Materials" name="%(product_open_bom)d" type="action"/>
+                    <button string="Product BoM Structure" name="%(act_product_mrp_bom_open)d" type="action" groups="mrp.group_mrp_user"/>
+                    <button string="Manufacturing Orders" name="%(act_product_mrp_production)d" type="action" groups="mrp.group_mrp_user"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
index 7c11133ce7d..6ee3a7ddc20 100644
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -19,14 +19,22 @@
                 </form>
             </field>
         </record>
-
-        <act_window name="Product Margins"
-            res_model="product.margin"
-            src_model="product.product"
-            view_mode="form"
-            target="new"
-            key2="client_action_multi"
-            id="product_margin_act_window"/>
-
+        <record id="action_product_margin_form" model="ir.actions.act_window">
+            <field name="name">Product Margins</field>
+            <field name="res_model">product.margin</field>
+            <field name="src_model">product.product</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <record model="ir.ui.view" id="product_form_view_margin">
+             <field name="name">product.product.margin</field>
+             <field name="model">product.product</field>
+             <field name="inherit_id" ref="product.product_normal_form_view"/>
+             <field name="arch" type="xml">
+                 <xpath expr="//div[@name='buttons']" position="inside">
+                     <button string="Product Margins" name="%(action_product_margin_form)d" type="action" groups="base.group_sale_manager"/>
+                 </xpath>
+             </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 3317c3bde59..dea558abeef 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -492,15 +492,6 @@
             </field>
         </record>
 
-        <act_window
-            context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
-            id="action_purchase_line_product_tree"
-            name="Purchases"
-            res_model="purchase.order.line"
-            src_model="product.product"
-            groups="purchase.group_purchase_user"/>
-
-
         <record id="purchase_line_form_action2" model="ir.actions.act_window">
             <field name="name">On Purchase Order Lines</field>
             <field name="type">ir.actions.act_window</field>
@@ -613,12 +604,20 @@
                 </field>
             </field>
         </record>
-  
+        <record model="ir.actions.act_window" id="action_purchase_line_product_tree">
+            <field name="context">{'search_default_product_id': [active_id], 'default_product_id': active_id}</field>
+            <field name="name">Purchases</field>
+            <field name="res_model">purchase.order.line</field>
+            <field name="view_id" ref="purchase_order_line_tree"/>
+        </record>
         <record id="view_product_account_purchase_ok_form" model="ir.ui.view">
             <field name="name">product.account.purchase.ok.form.inherit</field>
             <field name="model">product.product</field>
             <field name="inherit_id" ref="account.product_normal_form_view"/>
             <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                   <button string="Purchase" name="%(action_purchase_line_product_tree)d" type="action" groups="purchase.group_purchase_user"/>
+                </xpath>
                 <xpath expr="//field[@name='property_account_expense']" position="replace" >
                      <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" groups="account.group_account_user"/>
                 </xpath>
@@ -627,6 +626,5 @@
                 </xpath>
             </field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 18fdb739923..f35b3c94168 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -538,15 +538,22 @@
             <field name="domain">[('invoiced','&lt;&gt;', 1),('state','=','done')]</field>
             <field name="filter" eval="True"/>
         </record>
-
-        <act_window
-            context="{'search_default_product_id': active_id, 'default_product_id': active_id}"
-            id="action_order_line_product_tree"
-            name="Sales Order Lines"
-            res_model="sale.order.line"
-            src_model="product.product"
-            groups="base.group_sale_salesman"/>
-
+        <record id="action_order_line_product_tree" model="ir.actions.act_window">
+            <field name="context">{'search_default_product_id': active_id, 'default_product_id': active_id}</field>
+            <field name="name">Sales Order Lines</field>
+            <field name="res_model">sale.order.line</field>
+            <field name="view_id" ref="view_order_line_tree"/>
+        </record>
+        <record model="ir.ui.view" id="product_form_view_sale_order_button">
+            <field name="name">product.product.sale.order</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button string="Sales Order Lines" name="%(action_order_line_product_tree)d" type="action" groups="base.group_sale_salesman"/>
+                </xpath>
+            </field>
+        </record>
         <menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5"/>
         <menuitem id="menu_invoicing_sales_order_lines" parent="base.menu_invoiced" action="action_order_line_tree2" sequence="10" groups="sale.group_invoice_so_lines"/>
 
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 594843eff8d..b40809071ee 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -68,6 +68,10 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                   <button string="Stock by Location" name="%(action_product_location_tree)d" type="action" attrs="{'invisible':[('type', '!=', 'product')]}"  groups="base.group_locations"/>
+                   <button string="Move" name= "%(act_product_stock_move_open)d" type="action" attrs="{'invisible':[('type', '!=', 'product')]}" groups="base.group_stock_user"/>
+                </xpath>
                 <group name="procurement_uom" position="before">
                     <group name="delay" string="Delays">
                         <label for="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index f56d738636d..e8bb6621355 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -2,13 +2,6 @@
 <openerp>
     <data>
 
-        <act_window
-            context="{'product_id': active_id}"
-            id="act_stock_product_location_open"
-            name="Stock by Location"
-            res_model="stock.location"
-            src_model="product.product"/>
-
         <act_window
             domain="[('tracking_id', '=', active_id)]"
             id="act_stock_tracking_lot_2_stock_report_tracklots"
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a559aad9aac..96735c040c5 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -632,6 +632,16 @@
                 </tree>
             </field>
         </record>
+        <record model="ir.actions.act_window" id="action_product_location_tree">
+            <field name="context">"{'product_id': active_id}</field>
+            <field name="name">Stock by Location</field>
+            <field name="res_model">stock.location</field>
+        </record>
+        <record id="act_product_stock_move_open" model="ir.actions.act_window">
+            <field name="context">{'search_default_done': 1,'search_default_product_id': [active_id], 'default_product_id': active_id}</field>
+            <field name="name">Move</field>
+            <field name="res_model">stock.move</field>
+        </record>
         <record id="action_location_tree" model="ir.actions.act_window">
             <field name="name">Location Structure</field>
             <field name="res_model">stock.location</field>
@@ -1562,21 +1572,6 @@
             res_model="product.product"
             src_model="stock.location"/>
 
-        <act_window
-            context="{'search_default_done': 1,'search_default_product_id': [active_id], 'default_product_id': active_id}"
-            id="act_product_stock_move_open"
-            name="Inventory Move"
-            res_model="stock.move"
-            src_model="product.product"/>
-
-        <act_window
-            context="{'search_default_future': 1,'search_default_product_id': [active_id], 'default_product_id': active_id}"
-            domain="[('state','in',('waiting','confirmed','assigned'))]"
-            id="act_product_stock_move_futur_open"
-            name="Future Stock Moves"
-            res_model="stock.move"
-            src_model="product.product"/>
-
         <record id="ir_act_product_location_open" model="ir.values">
             <field name="key2">tree_but_open</field>
             <field name="model">stock.location</field>

From 78311c1ee4b9b6e9b2662aed472683bd807ae5d0 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Wed, 20 Feb 2013 16:44:12 +0530
Subject: [PATCH 23/31] [IMP]Improve code

bzr revid: vja@tinyerp.com-20130220111412-ph853pkq0z1dwubd
---
 addons/product_margin/wizard/product_margin_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
index 6ee3a7ddc20..29df55c260a 100644
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -19,7 +19,7 @@
                 </form>
             </field>
         </record>
-        <record id="action_product_margin_form" model="ir.actions.act_window">
+        <record id="product_margin_act_window" model="ir.actions.act_window">
             <field name="name">Product Margins</field>
             <field name="res_model">product.margin</field>
             <field name="src_model">product.product</field>
@@ -32,7 +32,7 @@
              <field name="inherit_id" ref="product.product_normal_form_view"/>
              <field name="arch" type="xml">
                  <xpath expr="//div[@name='buttons']" position="inside">
-                     <button string="Product Margins" name="%(action_product_margin_form)d" type="action" groups="base.group_sale_manager"/>
+                     <button string="Product Margins" name="%(product_margin_act_window)d" type="action" groups="base.group_sale_manager"/>
                  </xpath>
              </field>
         </record>

From 289dd74646912687740ed9d27b905193391bea08 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Wed, 20 Feb 2013 18:49:06 +0530
Subject: [PATCH 24/31] [imp]Minor changes

bzr revid: vja@tinyerp.com-20130220131906-mxxgyaebybgdu0tj
---
 addons/stock/product_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index b40809071ee..6ce6ad6b551 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -69,8 +69,8 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
-                   <button string="Stock by Location" name="%(action_product_location_tree)d" type="action" attrs="{'invisible':[('type', '!=', 'product')]}"  groups="base.group_locations"/>
-                   <button string="Move" name= "%(act_product_stock_move_open)d" type="action" attrs="{'invisible':[('type', '!=', 'product')]}" groups="base.group_stock_user"/>
+                   <button string="Stock by Location" name="%(action_product_location_tree)d" type="action"  attrs="{'invisible':[('type', '!=', 'product')]}" groups="stock.group_locations"/>
+                   <button string="Move" name= "%(act_product_stock_move_open)d" type="action" attrs="{'invisible':[('type', '!=', 'product')]}" groups="stock.group_stock_user"/>
                 </xpath>
                 <group name="procurement_uom" position="before">
                     <group name="delay" string="Delays">

From 2e66518989e2065dd3e8e3b7e541a2f1afa91624 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Wed, 20 Feb 2013 19:03:06 +0530
Subject: [PATCH 25/31] made invoices button invisible in sent state too

bzr revid: cha@tinyerp.com-20130220133306-dho6b01zbqx7jff2
---
 addons/purchase/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 188baeccd69..14d1e313e7f 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -49,7 +49,7 @@
                             name="view_picking"
                             string="Incoming Shipments" states="approved"/>
                         <button type="object"  name="invoice_open"
-                            string="Invoices" attrs="{'invisible': [('state', '=', 'draft')]}"/> 
+                            string="Invoices" attrs="{'invisible': [('state', 'in', ['draft','sent'])]}"/> 
                     </div>
                 </xpath>
             </field>

From 0ee78a48f4518bd4e1fca89c59aeaa9328fb65dc Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Thu, 21 Feb 2013 12:03:51 +0530
Subject: [PATCH 26/31] [Fix][purchases] quotes/pos in rfq sent status are not
 visible

bzr revid: vja@tinyerp.com-20130221063351-uef0qsw362k3x1dg
---
 addons/purchase/purchase_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 3317c3bde59..fad90d3fc3d 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -334,8 +334,8 @@
             <field name="name">Quotations</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
-            <field name="context">{'search_default_draft': 1, 'search_default_to_approve': 1}</field>
-            <field name="domain">[('state','in',('draft','sent','confirmed'))]</field>
+            <field name="context">{}</field>
+            <field name="domain">[('state','in',('draft','sent','cancel'))]</field>
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help" type="html">

From ab5d9fac32ef778201b6dbba952eb24bc7af1456 Mon Sep 17 00:00:00 2001
From: Vidhin Mehta <vme@tinyerp.com>
Date: Thu, 21 Feb 2013 14:38:37 +0530
Subject: [PATCH 27/31] [IMP]change misguiding tooltip.

bzr revid: vme@tinyerp.com-20130221090837-464ff8hnyniq1zi3
---
 addons/project/res_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index 2604ebde732..e4b30adc047 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -34,7 +34,7 @@ class project_configuration(osv.osv_memory):
                 This installs the module project_mrp."""),
         'module_pad': fields.boolean("Use integrated collaborative note pads on task",
             help="""Lets the company customize which Pad installation should be used to link to new pads
-                (by default, http://ietherpad.com/).
+                (for an example, http://ietherpad.com/).
                 This installs the module pad."""),
         'module_project_timesheet': fields.boolean("Record timesheet lines per tasks",
             help="""This allows you to transfer the entries under tasks defined for Project Management to

From 28022f07bfedfe91c298c7c7a9ab0aa1dc7d59fc Mon Sep 17 00:00:00 2001
From: Vidhin Mehta <vme@tinyerp.com>
Date: Thu, 21 Feb 2013 15:12:55 +0530
Subject: [PATCH 28/31] [IMP]

bzr revid: vme@tinyerp.com-20130221094255-ym41ug3ij7xa35nl
---
 addons/project/res_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index e4b30adc047..ddf98582ef3 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -34,7 +34,7 @@ class project_configuration(osv.osv_memory):
                 This installs the module project_mrp."""),
         'module_pad': fields.boolean("Use integrated collaborative note pads on task",
             help="""Lets the company customize which Pad installation should be used to link to new pads
-                (for an example, http://ietherpad.com/).
+                (for example: http://ietherpad.com/).
                 This installs the module pad."""),
         'module_project_timesheet': fields.boolean("Record timesheet lines per tasks",
             help="""This allows you to transfer the entries under tasks defined for Project Management to

From efd26394f8172aa8868c8a7c4b10efab07941eb5 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Thu, 21 Feb 2013 15:29:34 +0530
Subject: [PATCH 29/31] [Fix] correct typo in button names: Move => Moves,
 Purchase => Purchases

bzr revid: vja@tinyerp.com-20130221095934-rrvakpyklngu37sz
---
 addons/purchase/purchase_view.xml | 2 +-
 addons/stock/product_view.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index dea558abeef..51cb4c8662e 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -616,7 +616,7 @@
             <field name="inherit_id" ref="account.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
-                   <button string="Purchase" name="%(action_purchase_line_product_tree)d" type="action" groups="purchase.group_purchase_user"/>
+                   <button string="Purchases" name="%(action_purchase_line_product_tree)d" type="action" groups="purchase.group_purchase_user"/>
                 </xpath>
                 <xpath expr="//field[@name='property_account_expense']" position="replace" >
                      <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" groups="account.group_account_user"/>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 6ce6ad6b551..9d15511b006 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -70,7 +70,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                    <button string="Stock by Location" name="%(action_product_location_tree)d" type="action"  attrs="{'invisible':[('type', '!=', 'product')]}" groups="stock.group_locations"/>
-                   <button string="Move" name= "%(act_product_stock_move_open)d" type="action" attrs="{'invisible':[('type', '!=', 'product')]}" groups="stock.group_stock_user"/>
+                   <button string="Moves" name= "%(act_product_stock_move_open)d" type="action" attrs="{'invisible':[('type', '!=', 'product')]}" groups="stock.group_stock_user"/>
                 </xpath>
                 <group name="procurement_uom" position="before">
                     <group name="delay" string="Delays">

From fc7fb157fc8491aa3b2a96460e48d5c3a9e1cb7c Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 21 Feb 2013 17:46:47 +0530
Subject: [PATCH 30/31] [IMP] hr_recruitment: added access right for
 crm.meeting.type

bzr revid: cha@tinyerp.com-20130221121647-ffnqsmpmdww0e7ns
---
 addons/hr_recruitment/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 2d0b85faf70..dd7aca08531 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -10,3 +10,4 @@ access_hr_recruitment_source_hr_officer,hr.recruitment.source,model_hr_recruitme
 access_hr_recruitment_source_all,hr.recruitment.source,model_hr_recruitment_source,,1,0,0,0
 access_hr_applicant_category,hr.applicant_category,model_hr_applicant_category,,1,1,1,0
 access_hr_applicant_category_manager,hr.applicant_category,model_hr_applicant_category,base.group_hr_manager,1,1,1,1
+access_crm_meeting_type_hr_officer,crm.meeting.type.officer,base_calendar.model_crm_meeting_type,base.group_hr_user,1,1,1,1

From f54c6dcd0b36b080902baba42ed0a3a62f3e07d1 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Thu, 21 Feb 2013 19:12:54 +0530
Subject: [PATCH 31/31] [IMP]typo

bzr revid: vja@tinyerp.com-20130221134254-jmoi7krnnorwq2n1
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 96735c040c5..6d8008206ea 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -639,7 +639,7 @@
         </record>
         <record id="act_product_stock_move_open" model="ir.actions.act_window">
             <field name="context">{'search_default_done': 1,'search_default_product_id': [active_id], 'default_product_id': active_id}</field>
-            <field name="name">Move</field>
+            <field name="name">Moves</field>
             <field name="res_model">stock.move</field>
         </record>
         <record id="action_location_tree" model="ir.actions.act_window">