From ce3882d8d73fba3a12d15f0b200e5033ff98f5c2 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Tue, 23 Oct 2012 12:20:37 +0530
Subject: [PATCH 1/2] [FIX]:Task issue in project module

bzr revid: aja@tinyerp.com-20121023065037-2i16k4xlsczqj04y
---
 addons/pad/pad.py                             | 2 +-
 addons/project_timesheet/project_timesheet.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/pad/pad.py b/addons/pad/pad.py
index 0cbb6107979..06d9aa3688f 100644
--- a/addons/pad/pad.py
+++ b/addons/pad/pad.py
@@ -86,7 +86,7 @@ class pad_common(osv.osv_memory):
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
-        for k,v in self._all_columns:
+        for k,v in self._all_columns.iteritems():
             field = v.column
             if hasattr(field,'pad_content_field'):
                 pad = self.pad_generate_url(cr, uid, context)
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 7963c30b2be..fe4b848f522 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -115,7 +115,7 @@ class project_work(osv.osv):
         if not context.get('no_analytic_entry',False):
             task_obj = task_obj.browse(cr, uid, vals['task_id'])
             result = self.get_user_related_details(cr, uid, vals.get('user_id', uid))
-            vals_line['name'] = '%s: %s' % (tools.ustr(task_obj.name), tools.ustr(vals['name']) or '/')
+            vals_line['name'] = '%s: %s' % (tools.ustr(task_obj.name), tools.ustr(vals['name'] or '/'))
             vals_line['user_id'] = vals['user_id']
             vals_line['product_id'] = result['product_id']
             vals_line['date'] = vals['date'][:10]
@@ -172,7 +172,7 @@ class project_work(osv.osv):
 
             vals_line = {}
             if 'name' in vals:
-                vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name']) or '/')
+                vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name'] or '/'))
             if 'user_id' in vals:
                 vals_line['user_id'] = vals['user_id']
             if 'date' in vals:

From f3682ca551c57571ec5e97e9c6cc1c1f6d89deae Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 23 Oct 2012 12:41:42 +0530
Subject: [PATCH 2/2] [FIX] sale_stock: improve onchange to update tax.

bzr revid: tpa@tinyerp.com-20121023071142-dz227is8kp91ivxb
---
 addons/sale_stock/sale_stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
index 668f037bad8..a033e3e6d33 100644
--- a/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -56,7 +56,7 @@
                        <field name="product_id"
                        context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
                        groups="base.group_user" 
-                       on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
+                       on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
                    </field>
                    <field name="product_uom_qty" position="replace">
                        <field context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"