From bb5d7cf5725bb6642838fc70717cbdc8b540588c Mon Sep 17 00:00:00 2001
From: Chris Halls <chris.halls@credativ.co.uk>
Date: Fri, 16 Apr 2010 16:24:29 +0100
Subject: [PATCH 01/23] [FIX] When duplicating a production order, clear
 existing stock moves

If a production order is duplicated, it will be because someone wants to
build the same item(s) again. The copy function already puts the production
order back into state draft but does not delete the related stock movements
and consumed products.

bzr revid: chris.halls@credativ.co.uk-20100416152429-2ygxfb32lvew3bgl
---
 addons/mrp/mrp.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index eda4f076602..0e051e7ac2e 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -560,8 +560,12 @@ class mrp_production(osv.osv):
         default.update({
             'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.production'),
             'move_lines' : [],
-            'move_created_ids': [],
-            'state': 'draft'
+            'move_lines2' : [],
+            'move_created_ids' : [],
+            'move_created_ids2' : [],
+            'product_lines' : [],
+            'state': 'draft',
+            'picking_id': False
         })
         return super(mrp_production, self).copy(cr, uid, id, default, context)
 

From 8dd9bd5477d4ad7e10e2a2956b10c669141881b8 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 30 Jun 2010 10:16:35 +0530
Subject: [PATCH 02/23] [FIX] stock-planning: onchange amount

bzr revid: mra@mra-laptop-20100630044635-e6wbx4u7zvoi3tgn
---
 addons/stock_planning/stock_planning.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
index 0c957d8b72e..ef9fa7e65dd 100644
--- a/addons/stock_planning/stock_planning.py
+++ b/addons/stock_planning/stock_planning.py
@@ -346,12 +346,13 @@ class stock_sale_forecast(osv.osv):
 
     def product_amt_change(self, cr, uid, ids, product_amt = 0.0, product_uom=False):
         ret={}
+        round_value = 1
         if product_amt:
             coeff_def2uom = 1
             val1 = self.browse(cr, uid, ids)
             val = val1[0]
             if (product_uom != val.product_id.uom_id.id):
-                coeff_def2uom, rounding = self._from_default_uom_factor( cr, uid, val, product_uom, {})
+                coeff_def2uom, round_value = self._from_default_uom_factor( cr, uid, val, product_uom, {})
             ret['product_qty'] = rounding(coeff_def2uom * product_amt/(val.product_id.product_tmpl_id.list_price), round_value)
         res = {'value': ret}
         return res

From 216e257c51bffabdbe8943d74a3eab1855b79efa Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Wed, 30 Jun 2010 11:34:05 +0200
Subject: [PATCH 03/23] [IMP] account: improved help tooltips on product and
 product category. Thanks Ferdinand @ ChriCar for the contribution

lp bug: https://launchpad.net/bugs/549715 fixed

bzr revid: qdp-launchpad@tinyerp.com-20100630093405-58e1trh15i2xls2v
---
 addons/account/product.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/product.py b/addons/account/product.py
index ce91b9b0743..188c3260dff 100644
--- a/addons/account/product.py
+++ b/addons/account/product.py
@@ -33,7 +33,7 @@ class product_category(osv.osv):
             string="Income Account",
             method=True,
             view_load=True,
-            help="This account will be used to value incoming stock(i.e. credit of incoming goods) for the current product category"),
+            help="This account will be used for invoices to value sales for the current product category"),
         'property_account_expense_categ': fields.property(
             'account.account',
             type='many2one',
@@ -41,7 +41,7 @@ class product_category(osv.osv):
             string="Expense Account",
             method=True,
             view_load=True,
-            help="This account will be used to value outgoing stock(i.e. debit of outgoing goods) for the current product category"),
+            help="This account will be used for invoices to value expenses for the current product category"),
     }
 product_category()
 
@@ -64,7 +64,7 @@ class product_template(osv.osv):
             string="Income Account",
             method=True,
             view_load=True,
-            help="This account will be used instead of the default one to value incoming stock for the current product"),
+            help="This account will be used for invoices instead of the default one to value sales for the current product"),
         'property_account_expense': fields.property(
             'account.account',
             type='many2one',
@@ -72,7 +72,7 @@ class product_template(osv.osv):
             string="Expense Account",
             method=True,
             view_load=True,
-            help="This account will be used instead of the default one to value outgoing stock for the current product"),
+            help="This account will be used for invoices instead of the default one to value expenses for the current product"),
     }
 product_template()
 

From 2d6a0e2329abbf2d5269fb9ccd17c80404b2fe6b Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 30 Jun 2010 15:13:07 +0530
Subject: [PATCH 04/23] [FIX]: * caldav: Export calendar with recurrent event *
 base_calendar: Fix wrong code in Exrule wizard

bzr revid: rpa@tinyerp.com-20100630094307-n6lucf47o1ixsai4
---
 addons/base_calendar/wizard/base_calendar_set_exrule.py | 9 ++++-----
 addons/caldav/calendar.py                               | 6 +-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/addons/base_calendar/wizard/base_calendar_set_exrule.py b/addons/base_calendar/wizard/base_calendar_set_exrule.py
index febfb39e1ef..ab458c8f7f5 100644
--- a/addons/base_calendar/wizard/base_calendar_set_exrule.py
+++ b/addons/base_calendar/wizard/base_calendar_set_exrule.py
@@ -82,12 +82,11 @@ class base_calendar_set_exrule(osv.osv_memory):
         @param uid: the current user’s ID for security checks,
         @param fields: List of fields for default value
         @param context: A standard dictionary for contextual values
-
         """
-        crm_obj = self.pool.get('crm.meeting')
-        for meeting in crm_obj.browse(cr, uid, context.get('active_ids', [])):
-            if not meeting.rrule:
-                raise osv.except_osv(_("Warning !"), _("Please Apply Recurrency after Apply Exception Rule"))
+        event_obj = self.pool.get(context.get('active_model'))
+        for event in event_obj.browse(cr, uid, context.get('active_ids', [])):
+            if not event.rrule:
+                raise osv.except_osv(_("Warning !"), _("Please Apply Recurrency before applying Exception Rule."))
         return False
 
     def compute_exrule_string(self, cr, uid, ids, context=None):
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index 3e4701a08d5..409ffa6b5ad 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -277,11 +277,7 @@ class CalDAV(object):
                                            % (model_obj._table, data[map_field]))
                             r_ids = map(lambda x: x[0], cr.fetchall())
                         if r_ids:
-                            rdata = self.pool.get(model).read(cr, uid, r_ids)
-                            event_obj = self.pool.get('basic.calendar.event')
-                            rcal = event_obj.export_cal(cr, uid, rdata, context=context)
-                            for revents in rcal.contents['vevent']:
-                                ical.contents['vevent'].append(revents)
+                            rcal = self.export_cal(cr, uid, r_ids, 'vevent', context=context)
                         if data.get('recurrent_uid', None):
                             uidval = openobjectid2uid(cr, data['recurrent_uid'], model)
                         vevent.add('uid').value = uidval

From 1fe3270ecc814d055fa762a6973814bf91957820 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 30 Jun 2010 15:15:10 +0530
Subject: [PATCH 05/23] [IMP]: base_calendar, crm, project_caldav: View
 improvements for recurrence rule and exrule

bzr revid: rpa@tinyerp.com-20100630094510-0do4n1yoanaijmxu
---
 addons/base_calendar/base_calendar_view.xml   |  9 ++-
 addons/crm/crm_meeting_view.xml               |  7 +-
 addons/project_caldav/project_caldav_view.xml | 67 ++++++++++++++++---
 3 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index aa63dc696de..5f79e0f2681 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -222,10 +222,15 @@
                                <field name="rrule_type" string="Recurrency"
                                     colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
                                <button string="Edit All"
-                                   help="Edit all Ourrences of recurrent Meeting"
+                                   help="Edit all Ourrences of recurrent Events"
                                    attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
                                    name="open_event" icon="gtk-edit"
                                    type="object" />
+                               <button string="ExRule"
+                                    help="Add Exception Rule"
+                                    name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
+                                    context="{'model' : 'calendar.event'}"
+                                    attrs="{'invisible':[('rrule_type','in', ('none', False))]}"/>
                         </group>
                     </group>
                     <group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
@@ -350,7 +355,7 @@
             <field name="arch" type="xml">
                 <tree string="Events">
                     <field name="name" string="Subject" />
-                    <field name="date" string="Meeting Date" />
+                    <field name="date" string="Event Date" />
                     <field name="location" />
                     <field name="show_as" />
                     <field name="class" string="Privacy" />
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 5d1bb3f29d7..e635a1d26bc 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -51,9 +51,10 @@
                                name="open_meeting" icon="gtk-edit"
                                type="object" />
                            <button string="ExRule"
-               name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
-               context="{'model' : 'crm.meeting'}"
-               attrs="{'invisible':[('rrule_type','in', ('none', False))]}"/>
+                                help="Add Exception Rule"
+                                name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
+                                context="{'model' : 'crm.meeting'}"
+                                attrs="{'invisible':[('rrule_type','in', ('none', False))]}"/>
                     </group>
                 </group>
                 <group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
diff --git a/addons/project_caldav/project_caldav_view.xml b/addons/project_caldav/project_caldav_view.xml
index 885878cfcd8..89ebe9e85da 100644
--- a/addons/project_caldav/project_caldav_view.xml
+++ b/addons/project_caldav/project_caldav_view.xml
@@ -67,15 +67,64 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="progress" position="after">
-                    <group colspan="2" col="3">
-<!--                        <field name="rrule_type" string="Recurrency"
-                            on_change="onchange_rrule_type(rrule_type)" colspan="1" />
--->                        <field name="rrule_type" string="Recurrency"
-                            colspan="1" />
-                        <button string="Custom" name="101"
-                            icon="gtk-save-as" type="action"
-                            context="{'model' : 'project.task'}"
-                            attrs="{'readonly': [('rrule_type','!=','custom')]}" />
+                    <group colspan="2" col="4" >
+                           <field name="rrule_type" string="Recurrency"
+                                colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
+                           <button string="Edit All"
+                               help="Edit all Ourrences of recurrent Task"
+                               attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
+                               name="open_meeting" icon="gtk-edit"
+                               type="object" />
+                           <button string="ExRule"
+                                help="Add Exception Rule"
+                                name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
+                                context="{'model' : 'project.task'}"
+                                attrs="{'invisible':[('rrule_type','in', ('none', False))]}"/>
+                    </group>
+                    <newline/>
+                    <group col="4" colspan="6" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
+                        <separator string="Data for Custom Rule" colspan="8"/>
+                        <group col="8" colspan="4">
+                            <field name="freq" />
+                            <field name="interval" />
+                            <field name="count" />
+                            <field name="end_date" />
+                        </group>
+                        <group col="14" colspan="4" name="Select weekdays"
+                            attrs="{'invisible' : [('freq','!=','weekly')]}">
+                            <field name="mo" colspan="1" />
+                            <field name="tu" colspan="1" />
+                            <field name="we" colspan="1" />
+                            <field name="th" colspan="1" />
+                            <field name="fr" colspan="1" />
+                            <field name="sa" colspan="1" />
+                            <field name="su" colspan="1" />
+                            <newline />
+                        </group>
+                        <group col="10" colspan="4"
+                            attrs="{'invisible' : [('freq','!=','monthly'), ('freq','!=','yearly')]}">
+                            <group col="2" colspan="1">
+                                <field name="select1" />
+                            </group>
+                            <group col="2" colspan="1"
+                                attrs="{'invisible' : [('select1','=','day')]}">
+                                <field name="day"
+                                    attrs="{'required' : [('select1','=','date')]}" />
+                            </group>
+                            <group col="3" colspan="1"
+                                attrs="{'invisible' : [('select1','=','date')]}">
+                                <field name="byday" string="The"
+                                    attrs="{'required' : [('select1','=','day')]}" />
+                                <field name="week_list" nolabel="1"
+                                    attrs="{'required' : [('select1','=','day')]}" />
+                            </group>
+                            <group col="1" colspan="1"
+                                attrs="{'invisible' : [('freq','!=','yearly')]}">
+                                <field name="month_list" string="of"
+                                    colspan="1"
+                                    attrs="{'required' : [('freq','=','yearly')]}" />
+                            </group>
+                        </group>
                     </group>
                 </field>
             </field>

From b56f0a0fdd6495ca588a7ca1b6b77848cef5356d Mon Sep 17 00:00:00 2001
From: "rch(OpenERP)" <>
Date: Wed, 30 Jun 2010 15:48:58 +0530
Subject: [PATCH 06/23] [IMP]:Project Dashboard

bzr revid: jni@tinyerp.com-20100630101858-erd9gf31ce4fvw4q
---
 addons/project/report/project_report.py       | 28 +------------------
 addons/project/report/project_report_view.xml | 10 +++----
 addons/project/security/ir.model.access.csv   |  1 -
 3 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index b115b576859..ff8d2b2dfc1 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -104,7 +104,7 @@ class report_project_task_user(osv.osv):
                     (extract('epoch' from (t.date_deadline-t.date_end)))/(3600*24)  as delay_endings_days
               from project_task t
 
-                group by 
+                group by
                     t.id,
                     remaining_hours,
                     t.effective_hours,
@@ -203,31 +203,5 @@ class task_by_days(osv.osv):
         """)
 task_by_days()
 
-class task_by_days_vs_planned_hours(osv.osv):
-    _name = "task.by.days.vs.planned.hours"
-    _description = "Task By Days vs Planned Hours"
-    _auto = False
-    _columns = {
-        'day': fields.char('Day', size=128, required=True),
-        'planned_hour': fields.float('Planned Hours', readonly=True),
-        'project_id':fields.many2one('project.project','Project')
-     }
-    _order = 'day desc'
-    def init(self, cr):
-        tools.sql.drop_view_if_exists(cr, 'task_by_days_vs_planned_hours')
-        cr.execute("""
-            create or replace view task_by_days_vs_planned_hours as (
-                select
-                    min(pt.id) as id,
-                    to_char(pt.create_date, 'YYYY-MM-DD') as day,
-                    sum(planned_hours) as planned_hour,
-                    pt.project_id
-                from
-                    project_task as pt
-                group by
-                    to_char(pt.create_date, 'YYYY-MM-DD'),pt.project_id
-            )
-        """)
-task_by_days_vs_planned_hours()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 92edbc78d77..9a047fbdd0f 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -221,24 +221,24 @@
     <!-- Views and action for project  dashboard -->
     <record id="view_task_by_days_vs_planned_hours_tree" model="ir.ui.view">
         <field name="name">task.by.days.vs.planned.hours.tree</field>
-        <field name="model">task.by.days.vs.planned.hours</field>
+        <field name="model">report.project.task.user</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Task By Days vs Planned Hours" >
                 <field name="day"/>
-                <field name="planned_hour"/>
+                <field name="hours_planned"/>
             </tree>
         </field>
     </record>
 
     <record id="view_task_by_days_vs_planned_hours_graph" model="ir.ui.view">
          <field name="name">task.by.days.vs.planned.hours.graph</field>
-         <field name="model">task.by.days.vs.planned.hours</field>
+         <field name="model">report.project.task.user</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Task By Days vs Planned Hours" type="bar">
                  <field name="day"/>
-                 <field name="planned_hour" operator="+"/>
+                 <field name="hours_planned" operator="+"/>
                  <field name="project_id" group="True"/>
              </graph>
          </field>
@@ -246,7 +246,7 @@
 
     <record id="action_task_by_days_vs_planned_hours_graph" model="ir.actions.act_window">
         <field name="name">Task By Days vs Planned Hours</field>
-        <field name="res_model">task.by.days.vs.planned.hours</field>
+        <field name="res_model">report.project.task.user</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
         <field name="view_id" ref="view_task_by_days_vs_planned_hours_graph"/>
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index bb675c4fe90..99ff1ea3629 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -12,7 +12,6 @@
 "access_project_message","project.message","model_project_message","project.group_project_user",1,1,1,1
 "access_report_project_task_user","report.project.task.user","model_report_project_task_user","project.group_project_manager",1,0,0,0
 "access_project_vs_remaining_hours","project.vs.remaining.hours","model_project_vs_remaining_hours","project.group_project_user",1,1,1,1
-"access_task_by_days_vs_planned_hours","task.by.days.vs.planned.hour","model_task_by_days_vs_planned_hours","project.group_project_user",1,1,1,1
 "access_task_by_days","task.by.days","model_task_by_days","project.group_project_user",1,1,1,1
 "access_partner_task user","base.res.partner user","base.model_res_partner","project.group_project_user",1,0,0,0
 "access_partner_task manager","base.res.partner manager","base.model_res_partner","project.group_project_manager",1,0,0,0

From 3eaf4bb5367d79fc6795c82e45ca8c540969c6a5 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 30 Jun 2010 15:56:30 +0530
Subject: [PATCH 07/23] [IMP]: base_calendar: When we clear rrule, it should
 clear exrule

bzr revid: rpa@tinyerp.com-20100630102630-m326atzgci08kioz
---
 addons/base_calendar/base_calendar.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index c16477280c7..229e7b11fc7 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -992,6 +992,7 @@ class calendar_event(osv.osv):
             if datas.get('rrule_type'):
                 if datas.get('rrule_type') == 'none':
                     result[event] = False
+                    cr.execute("UPDATE %s set exrule=Null where id=%s" % (self._table, event))
                 elif datas.get('rrule_type') == 'custom':
                     if datas.get('interval', 0) < 0:
                         raise osv.except_osv('Warning!', 'Interval can not be Negative')

From 3e195a7ceebfff3a4c72b23f842f60522549e126 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 30 Jun 2010 13:18:08 +0200
Subject: [PATCH 08/23] [IMP] crm: another encoding issue fixed in crm +
 cleanup

bzr revid: odo@openerp.com-20100630111808-zrkcjrahu3ija53t
---
 addons/crm/board_crm_view.xml       | 1 -
 addons/crm/wizard/crm_send_email.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 4729ab7283d..30caaeb5ac9 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -90,7 +90,6 @@
             <field name="view_id" ref="board_crm_form"/>
         </record>
      	<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
-     	        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem
             name="CRM Configuration" parent="base.dashboard"
             id="menu_board_crm_config"
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 1f03d650130..bf0390cc2ef 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -174,7 +174,7 @@ class crm_send_new_email(osv.osv_memory):
             if 'email_from' in fields:
                 res.update({'email_from': user_mail_from})
             if 'subject' in fields:
-                res.update({'subject': str(context.get('subject', case.name) or '')})
+                res.update({'subject': ustr(context.get('subject', case.name) or '')})
             if 'email_cc' in fields:
                 res.update({'email_cc': case.email_cc or ''})
             if 'text' in fields:

From 3a1800eba83de0f80d67f3bca4a504f1e5615b16 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 30 Jun 2010 16:53:18 +0530
Subject: [PATCH 09/23] [FIX] mrp: mrp.pot duplication of msg id fixed

bzr revid: mra@mra-laptop-20100630112318-lruso2l4ihpt5n2c
---
 addons/mrp/i18n/mrp.pot | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index 5a1dde3c2a9..bd5bcdb2587 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -1947,12 +1947,6 @@ msgstr ""
 msgid "Stock value variation"
 msgstr ""
 
-
-#. module: mrp
-#: view:board.board:0
-msgid "Stock value variation"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Next production orders"

From dfd29b154e1f0e158b026c9bda325a0418351869 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 30 Jun 2010 13:25:27 +0200
Subject: [PATCH 10/23] [IMP] crm: another encoding issue fixed in crm +
 cleanup

bzr revid: odo@openerp.com-20100630112527-1vf0fciy34vuw8o8
---
 addons/crm/wizard/crm_send_email.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index bf0390cc2ef..01e14375d89 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -174,7 +174,7 @@ class crm_send_new_email(osv.osv_memory):
             if 'email_from' in fields:
                 res.update({'email_from': user_mail_from})
             if 'subject' in fields:
-                res.update({'subject': ustr(context.get('subject', case.name) or '')})
+                res.update({'subject': tools.ustr(context.get('subject', case.name) or '')})
             if 'email_cc' in fields:
                 res.update({'email_cc': case.email_cc or ''})
             if 'text' in fields:

From c8f509dd939f13ea361e75ff7bba33872f673855 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 30 Jun 2010 16:57:16 +0530
Subject: [PATCH 11/23] [FIX] purchase: purchase.pot duplication of msg id
 fixed

bzr revid: mra@mra-laptop-20100630112716-141sx7ez9uvwf4y3
---
 addons/purchase/i18n/purchase.pot | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index 9b0d906c3fa..5ff4c01d9ff 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -857,20 +857,12 @@ msgstr ""
 msgid "Waiting Schedule"
 msgstr ""
 
-
-#. module: purchase
-#: selection:report.purchase.order.category,state:0
-#: selection:report.purchase.order.product,state:0
-msgid "Invoice Exception"
-msgstr ""
-
 #. module: purchase
 #: field:report.purchase.order.category,price_total:0
 #: field:report.purchase.order.product,price_total:0
 msgid "Total Price"
 msgstr ""
 
-
 #. module: purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0

From ed3c20582ab1aed343cb6a7653ea2c053ccb1b10 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 30 Jun 2010 17:08:01 +0530
Subject: [PATCH 12/23] [FIX] project: project.pot duplication of msg id fixed

bzr revid: mra@mra-laptop-20100630113801-evyxbe51mlwi9gcy
---
 addons/project/i18n/project.pot | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index 05d651eeda7..e6038a49b39 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -1293,11 +1293,6 @@ msgstr ""
 msgid "Tasks Closed by Project"
 msgstr ""
 
-#. module: project
-#: selection:report.closed.task,state:0
-msgid "In Progress"
-msgstr ""
-
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task
 #: model:ir.ui.menu,name:project.menu_project_task_user_tree
@@ -1530,11 +1525,6 @@ msgstr ""
 msgid "Closed Tasks"
 msgstr ""
 
-#. module: project
-#: selection:report.task.user.pipeline.open,task_state:0
-msgid "Open"
-msgstr ""
-
 #. module: project
 #: field:report.closed.task,planned_hours:0
 msgid "Planned Hours"

From 8e5d585551133fc835877dbb46dc42f6c655ef0e Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 30 Jun 2010 17:15:40 +0530
Subject: [PATCH 13/23] [FIX] project: project.pot duplication of msg id fixed

bzr revid: mra@mra-laptop-20100630114540-k8snk50vqc7f5lwd
---
 addons/project/i18n/project.pot | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index e6038a49b39..2f99ea0ccf2 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -1300,12 +1300,6 @@ msgstr ""
 msgid "Tasks by User"
 msgstr ""
 
-#. module: project
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: project
 #: field:report.closed.task,remaining_hours:0
 msgid "Remaining Hours"

From a8e3cdf803948baa3ebfaa8e63ceece5f87dfc6e Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Wed, 30 Jun 2010 17:33:13 +0530
Subject: [PATCH 14/23] [IMP] event,mrp_repair,sale : Minor edit on
 notification messages

bzr revid: ach@tinyerp.com-20100630120313-nmsy7o8z9kpfo8ps
---
 addons/event/wizard/event_make_invoice_view.xml           | 4 ++--
 addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml | 2 +-
 addons/sale/wizard/sale_line_invoice.xml                  | 2 +-
 addons/sale/wizard/sale_make_invoice.xml                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/event/wizard/event_make_invoice_view.xml b/addons/event/wizard/event_make_invoice_view.xml
index 68a07ceeee8..ce9a9e2375f 100644
--- a/addons/event/wizard/event_make_invoice_view.xml
+++ b/addons/event/wizard/event_make_invoice_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
              <form string="Create invoices">
-                <separator colspan="4" string="Do you really want to create the invoices ?" />
+                <separator colspan="4" string="Do you really want to create the invoice(s) ?" />
                 <field name="grouped" />
                 <field name="invoice_date"/>
                 <group colspan="4">
@@ -38,4 +38,4 @@
     		view_mode="form" target="new"  view_type="form" />
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index f914d198d06..f856ffa8e22 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -10,7 +10,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create invoices">
-				    <separator colspan="4" string="Do you really want to create the invoices ?" />  
+				    <separator colspan="4" string="Do you really want to create the invoice(s) ?" />  
 				    <field name="group"/>
 				    <newline/>  
 				    <group col="2" colspan="4">
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index 0420a8c3404..eb9100c6777 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
              <form string="Create invoices">
-    			<separator colspan="4" string="Do you really want to create the invoices ?" />
+    			<separator colspan="4" string="Do you really want to create the invoice(s) ?" />
               	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
                	<button name="make_invoices" string="Create Invoices" type="object" icon="gtk-ok"/>
              </form>
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
index e019786c40d..9884aa1f021 100644
--- a/addons/sale/wizard/sale_make_invoice.xml
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Create invoices">
-            	<separator colspan="4" string="Do you really want to create the invoices ?" />
+            	<separator colspan="4" string="Do you really want to create the invoice(s) ?" />
     			<field name="grouped"/>
     			<newline/>
     			<field name="invoice_date"/>

From 853388377ff397535c638432273cb1dc91f4a370 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 30 Jun 2010 17:49:50 +0530
Subject: [PATCH 15/23] [FIX] project: project.pot duplication of msg id fixed

bzr revid: mra@mra-laptop-20100630121950-kfg9yle7h4mcg5oq
---
 addons/project/i18n/project.pot | 146 --------------------------------
 1 file changed, 146 deletions(-)

diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index 2f99ea0ccf2..23e495c0361 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -1300,11 +1300,6 @@ msgstr ""
 msgid "Tasks by User"
 msgstr ""
 
-#. module: project
-#: field:report.closed.task,remaining_hours:0
-msgid "Remaining Hours"
-msgstr ""
-
 #. module: project
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "No Task"
@@ -1315,70 +1310,12 @@ msgstr ""
 msgid "Report on tasks by user for projects"
 msgstr ""
 
-#. module: project
-#: view:report.closed.task:0
-msgid "Delay"
-msgstr ""
-
-#. module: project
-#: selection:report.closed.task,priority:0
-msgid "Very Low"
-msgstr ""
-
-#. module: project
-#: selection:report.closed.task,state:0
-#: selection:report.task.user.pipeline.open,task_state:0
-msgid "Draft"
-msgstr ""
-
-#. module: project
-#: selection:report.closed.task,priority:0
-msgid "Low"
-msgstr ""
-
-#. module: project
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: project
-#: field:report.closed.task,name:0
-msgid "Task summary"
-msgstr ""
-
-#. module: project
-#: selection:report.closed.task,state:0
-#: selection:report.task.user.pipeline.open,task_state:0
-msgid "Pending"
-msgstr ""
-
-#. module: project
-#: field:report.closed.task,state:0
-#: field:report.task.user.pipeline.open,task_state:0
-msgid "Status"
-msgstr ""
-
-#. module: project
-#: selection:report.closed.task,priority:0
-msgid "Medium"
-msgstr ""
-
 #. module: project
 #: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project.menu_timesheet_task_user
 msgid "Timesheet / Task Hours Per Month"
 msgstr ""
 
-#. module: project
-#: field:report.closed.task,progress:0
-msgid "Progress (%)"
-msgstr ""
-
-#. module: project
-#: field:report.closed.task,priority:0
-msgid "Importance"
-msgstr ""
-
 #. module: project
 #: field:report.task.user.pipeline.open,company_id:0
 msgid "Company"
@@ -1395,49 +1332,17 @@ msgid ""
 "Gives statistics on tasks by user on projects to check the pipeline of users."
 msgstr ""
 
-#. module: project
-#: field:report.task.user.pipeline.open,user_id:0
-#: field:report.timesheet.task.user,user_id:0
-msgid "User"
-msgstr ""
-
 #. module: project
 #: model:ir.actions.act_window,name:project.action_closed_task_board
 msgid "Task Closed Within Past 15 Days"
 msgstr ""
 
-#. module: project
-#: selection:report.closed.task,priority:0
-msgid "Very urgent"
-msgstr ""
-
-#. module: project
-#: selection:report.closed.task,state:0
-#: selection:report.task.user.pipeline.open,task_state:0
-msgid "Done"
-msgstr ""
-
 #. module: project
 #: field:report.task.user.pipeline.open,task_hrs:0
 #: field:report.timesheet.task.user,task_hrs:0
 msgid "Task Hours"
 msgstr ""
 
-#. module: project
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: project
-#: field:report.closed.task,delay_hours:0
-msgid "Delay Hours"
-msgstr ""
-
-#. module: project
-#: field:report.closed.task,project_id:0
-msgid "Project"
-msgstr ""
-
 #. module: project
 #: field:report.task.user.pipeline.open,task_nbr:0
 msgid "Task Number"
@@ -1448,22 +1353,6 @@ msgstr ""
 msgid "report.timesheet.task.user"
 msgstr ""
 
-#. module: project
-#: model:ir.model,name:project.model_report_task_user_pipeline_open
-msgid "Tasks by user and project"
-msgstr ""
-
-#. module: project
-#: view:report.closed.task:0
-msgid "Planned"
-msgstr ""
-
-#. module: project
-#: selection:report.closed.task,state:0
-#: selection:report.task.user.pipeline.open,task_state:0
-msgid "Cancelled"
-msgstr ""
-
 #. module: project
 #: view:report.timesheet.task.user:0
 msgid "Timesheet/Task hours Report Per Month"
@@ -1474,41 +1363,11 @@ msgstr ""
 msgid "Task Progress"
 msgstr ""
 
-#. module: project
-#: field:report.closed.task,date_close:0
-msgid "Date Closed"
-msgstr ""
-
-#. module: project
-#: field:report.closed.task,user_id:0
-msgid "Assigned to"
-msgstr ""
-
-#. module: project
-#: field:report.closed.task,sequence:0
-msgid "Sequence"
-msgstr ""
-
 #. module: project
 #: model:ir.model,name:project.model_report_closed_task
 msgid "Closed Task Report"
 msgstr ""
 
-#. module: project
-#: field:report.timesheet.task.user,name:0
-msgid "Month"
-msgstr ""
-
-#. module: project
-#: selection:report.closed.task,priority:0
-msgid "Urgent"
-msgstr ""
-
-#. module: project
-#: field:report.closed.task,date_deadline:0
-msgid "Deadline"
-msgstr ""
-
 #. module: project
 #: field:report.timesheet.task.user,timesheet_hrs:0
 msgid "Timesheet Hours"
@@ -1518,8 +1377,3 @@ msgstr ""
 #: view:report.closed.task:0
 msgid "Closed Tasks"
 msgstr ""
-
-#. module: project
-#: field:report.closed.task,planned_hours:0
-msgid "Planned Hours"
-msgstr ""

From 18e0728ccb3dd1379e4beb818c1322f45a136a00 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 30 Jun 2010 18:15:20 +0530
Subject: [PATCH 16/23] [IMP] hr_*: changes accourding to the Piratepad

bzr revid: psi@tinyerp.co.in-20100630124520-hr4ktw5yocnt9ijy
---
 addons/hr/hr.py                               |  4 +-
 addons/hr/hr_department_view.xml              |  8 +-
 addons/hr/hr_view.xml                         | 16 ++--
 addons/hr_attendance/report/bymonth.py        | 12 +--
 addons/hr_attendance/report/timesheet.py      | 12 +--
 .../wizard/hr_attendance_sign_in_out_view.xml |  1 +
 addons/hr_contract/hr_contract_view.xml       | 78 +++++++++++++++----
 addons/hr_evaluation/hr_evaluation.py         |  8 +-
 addons/hr_evaluation/hr_evaluation_view.xml   | 15 ++--
 .../wizard/hr_evaluation_mail_view.xml        | 15 ++--
 .../report/hr_expense_report_view.xml         |  2 +-
 addons/hr_timesheet/hr_timesheet_view.xml     |  5 +-
 .../report/hr_timesheet_report_view.xml       |  4 +-
 .../hr_timesheet_print_employee_view.xml      | 38 +++++----
 .../wizard/hr_timesheet_print_users_view.xml  | 26 ++++---
 .../hr_timesheet_invoice_view.xml             |  2 +
 .../hr_timesheet_invoice_report_view.xml      | 10 +--
 .../hr_timesheet_analytic_profit_view.xml     | 28 +++----
 .../hr_timesheet_invoice_create_view.xml      | 44 ++++++-----
 addons/survey/wizard/survey_answer.xml        | 11 ++-
 20 files changed, 209 insertions(+), 130 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 34c5b9ede9a..b5db01ac512 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -70,8 +70,8 @@ class hr_job(osv.osv):
     _description = "Job Description"
     _columns = {
         'name': fields.char('Job Name', size=128, required=True, select=True),
-        'expected_employees':fields.integer('Expected Employees'),
-        'no_of_employee': fields.function(_no_of_employee, method=True, string='No of Employees', type='integer'),
+        'expected_employees':fields.integer('Expected Employees', help='Required number of Employees'),
+        'no_of_employee': fields.function(_no_of_employee, method=True, string='No of Employees', type='integer', help='Number of Employees selected'),
         'employee_ids':fields.one2many('hr.employee', 'job_id','Employees'),
         'description': fields.text('Job Description'),
         'requirements':fields.text('Requirements'),
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 70576149592..c0b2e3c53c7 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -49,9 +49,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Departments">
-                    <group col='4' colspan='2'>
-                        <field name="name" />
-                        <field name="manager_id"/>
+                    <field name="name"/>
+                    <field name="manager_id" />
+                    <newline />
+                    <group expand="0" string="Group By...">
+                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>
                     </group>
                 </search>
              </field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 64ac0e27a48..f03058dccc7 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -42,7 +42,7 @@
                 <form string="Employee">
                     <group colspan="4" col="8">
                         <group colspan="6" col="6">
-                            <field colspan="6" name="name" select="1"/>
+                            <field colspan="6" name="name" />
                             <field name="user_id"/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                             <field name="active" groups="base.group_extended"/>
@@ -120,7 +120,6 @@
                 <search string="Employees">
                     <filter icon="terp-personal-" domain="[('active','=',False)]" string="Unactive"
                         groups="base.group_extended"/>
-                    <separator orientation="vertical" />
                     <field name="name"/>
                     <field name="department_id" widget="selection"/>
                     <field name="job_id" widget="selection"/>
@@ -181,7 +180,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Marital Status">
-                    <field colspan="4" name="name" nolabel="1" select="1"/>
+                    <field name="name"/>
+                    <separator colspan="4" string="Description"/>
                     <field colspan="4" name="description" nolabel="1"/>
                 </form>
             </field>
@@ -250,8 +250,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee Category">
-                    <field name="name" select="1"/>
-                    <field name="parent_id" select="1"/>
+                    <field name="name" />
+                    <field name="parent_id" />
                 </form>
             </field>
         </record>
@@ -328,8 +328,8 @@
             <field name="arch" type="xml">
                 <form string="Job">
                     <group col="6" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="department_id" select="1"/>
+                        <field name="name" />
+                        <field name="department_id" />
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="expected_employees"/>
                         <field name="no_of_employee"/>
@@ -356,7 +356,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Job">
-                    <field name="name" select="1"/>
+                    <field name="name" />
                     <field name="department_id" />
                     <field name="expected_employees"/>
                     <field name="no_of_employee"/>
diff --git a/addons/hr_attendance/report/bymonth.py b/addons/hr_attendance/report/bymonth.py
index e30d4107171..cfebc640777 100644
--- a/addons/hr_attendance/report/bymonth.py
+++ b/addons/hr_attendance/report/bymonth.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -42,7 +42,7 @@ class report_custom(report_rml):
         month = DateTime.DateTime(datas['form']['year'], datas['form']['month'], 1)
         user_xml = ['<month>%s</month>' % month2name[month.month], '<year>%s</year>' % month.year]
         for employee_id in ids:
-            emp = self.pool.get('hr.employee').read(cr, uid, 'read', [employee_id], ['name'])[0]
+            emp = pooler.get_pool(cr.dbname).get('hr.employee').read(cr, uid, [employee_id], ['name'])[0]
             stop, days_xml = False, []
             user_repr = '''
             <user>
@@ -74,15 +74,15 @@ class report_custom(report_rml):
                     if att['action'] == 'sign_out':
                         wh += (dt - ldt).hours
                     ldt = dt
-                
+
                 # Week xml representation
                 wh = hour2str(wh)
                 today_xml = '<day num="%s"><wh>%s</wh></day>' % ((today - month).days+1, wh)
                 days_xml.append(today_xml)
                 today, tomor = tomor, tomor + one_day
-                
+
             user_xml.append(user_repr % '\n'.join(days_xml))
-        
+
         xml = '''<?xml version="1.0" encoding="UTF-8" ?>
         <report>
         %s
diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index 9b428a6b54f..7319c366298 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -48,7 +48,7 @@ class report_custom(report_rml):
         user_xml = []
 
         for employee_id in ids:
-            emp = self.pool.get('hr.employee').read(cr, uid, [employee_id], ['id', 'name'])[0]
+            emp = pooler.get_pool(cr.dbname).get('hr.employee').read(cr, uid, [employee_id], ['id', 'name'])[0]
             monday, n_monday = first_monday, first_monday + one_week
             stop, week_xml = False, []
             user_repr = '''
@@ -71,7 +71,7 @@ class report_custom(report_rml):
                     attendances = cr.dictfetchall()
                     week_wh = {}
                     # Fake sign ins/outs at week ends, to take attendances across week ends into account
-                    # XXX this is wrong for the first sign-in ever and the last sign out to this date 
+                    # XXX this is wrong for the first sign-in ever and the last sign out to this date
                     if attendances and attendances[0]['action'] == 'sign_out':
                         attendances.insert(0, {'name': monday.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_in'})
                     if attendances and attendances[-1]['action'] == 'sign_in':
@@ -96,10 +96,10 @@ class report_custom(report_rml):
                 week_repr.append('</week>')
                 if len(week_repr) > 21: # 21 = minimal length of week_repr
                     week_xml.append('\n'.join(week_repr))
-                
+
                 monday, n_monday = n_monday, n_monday + one_week
             user_xml.append(user_repr % '\n'.join(week_xml))
-        
+
         xml = '''<?xml version="1.0" encoding="UTF-8" ?>
         <report>
         %s
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index a7a39312aff..7598543e302 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -12,6 +12,7 @@
                         <field name="name" />
                         <field name="state" />
                     </group>
+                    <separator colspan="4"/>
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="gtk-go-back" string="Sign in" name="si_check" type="object"/>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index e1135a9f058..16ceebb96b3 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -2,18 +2,6 @@
 <openerp>
     <data>
 
-        <record id="hr_contract_wage_type_period_view_form" model="ir.ui.view">
-            <field name="name">hr.contract.wage.type.period.view.form</field>
-            <field name="model">hr.contract.wage.type.period</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Wage Period">
-                    <field colspan="4" name="name"/>
-                    <field name="factor_days"/>
-                </form>
-            </field>
-        </record>
-
         <record id="hr_contract_wage_type_view_form" model="ir.ui.view">
             <field name="name">hr.contract.wage.type.view.form</field>
             <field name="model">hr.contract.wage.type</field>
@@ -37,26 +25,75 @@
                 <tree string="Wage Types">
                     <field name="name"/>
                     <field name="type"/>
+                    <field name="period_id" invisible="1"/>
                 </tree>
             </field>
         </record>
+
+        <record id="hr_contract_wage_type_view_search" model="ir.ui.view">
+            <field name="name">hr.contract.wage.type.view.search</field>
+            <field name="model">hr.contract.wage.type</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Wage Type">
+                   <group col='15' colspan='4'>
+                       <field name="name"/>
+                       <field name="type"/>
+                   </group>
+                   <newline/>
+                   <group expand="0" string="Group By..." colspan="4" col="20">
+                       <filter string="Period" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'period_id'}"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
         <record id="action_hr_contract_wage_type" model="ir.actions.act_window">
             <field name="name">Contract Wage Type</field>
             <field name="res_model">hr.contract.wage.type</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
+            <field name="search_view_id" ref="hr_contract_wage_type_view_search"/>
         </record>
 
         <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5"/>
 
         <menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56"/>
 
+        <record id="hr_contract_wage_type_period_view_form" model="ir.ui.view">
+            <field name="name">hr.contract.wage.type.period.view.form</field>
+            <field name="model">hr.contract.wage.type.period</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Wage Period">
+                    <field colspan="4" name="name"/>
+                    <field name="factor_days"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="hr_contract_wage_type_period_view_search" model="ir.ui.view">
+            <field name="name">hr.contract.wage.type.period.view.search</field>
+            <field name="model">hr.contract.wage.type.period</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Wage Period">
+                   <group col='15' colspan='4'>
+                       <field name="name"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
         <record id="action_hr_contract_wage_type_period" model="ir.actions.act_window">
             <field name="name">Wage period</field>
             <field name="res_model">hr.contract.wage.type.period</field>
             <field name="view_type">form</field>
+            <field name="domain">[]</field>
+            <field name="search_view_id" ref="hr_contract_wage_type_period_view_search"/>
         </record>
+
         <menuitem
                 action="action_hr_contract_wage_type_period"
                 id="hr_menu_contract_wage_type_period"
@@ -181,7 +218,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Contract Type">
-                    <field colspan="4" name="name" select="1"/>
+                    <field colspan="4" name="name"/>
                 </form>
             </field>
         </record>
@@ -196,11 +233,26 @@
                 </tree>
             </field>
         </record>
+
+        <record id="hr_contract_type_view_search" model="ir.ui.view">
+            <field name="name">hr.contract.type.view.search</field>
+            <field name="model">hr.contract.type</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Contract Type">
+                   <group col='15' colspan='4'>
+                       <field name="name"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
         <record id="action_hr_contract_type" model="ir.actions.act_window">
             <field name="name">Contract Types</field>
             <field name="res_model">hr.contract.type</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="hr_contract_type_view_search"/>
         </record>
         <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56"/>
 
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 3c13a8ab63c..dd6de871d7a 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -271,14 +271,16 @@ class hr_evaluation_interview(osv.osv):
         self.write(cr, uid, ids, { 'state' : 'waiting_answer'})
         return True
 
-    def survey_req_done(self, cr, uid, ids, context={}):
+    def survey_req_done(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         self.write(cr, uid, ids, { 'state' : 'done'})
         hr_eval_obj = self.pool.get('hr_evaluation.evaluation')
-        for id in self.browse(cr, uid, ids,context=context):
+        for id in self.browse(cr, uid, ids, context=context):
             flag = False
             wating_id = 0
             tot_done_req = 0
-            records = self.pool.get("hr_evaluation.evaluation").browse(cr, uid, [id.evaluation_id.id],context=context)[0].survey_request_ids
+            records = hr_eval_obj.browse(cr, uid, [id.evaluation_id.id],context=context)[0].survey_request_ids
             for child in records:
                 if child.state == "draft" :
                     wating_id = child.id
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 5784bb4d868..5d9c4e910d3 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -79,7 +79,7 @@
                  <notebook>
                    <page string="General">
                     <field name="plan_id" invisible="1"/>
-                    <group col="6" colspan="4">
+                    <group col="8" colspan="4">
                         <field name="name"/>
                         <field name="wait"/>
                         <field name="sequence"/>
@@ -290,15 +290,13 @@
             <field name="arch" type="xml">
                 <form string="Interview Evaluation">
                     <group col="4" colspan="4">
-                        <field name="survey_id"  colspan="3"/>
-                        <group  colspan="1">
+                        <field name="survey_id"/>
+                        <group col="2" colspan="2">
                             <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel"
                                 icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
                             <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done"
                                 icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
                         </group>
-                    </group>
-                    <group col="4" colspan="4">
                         <field name="date_deadline"/>
                         <field name="response" readonly="1"/>
                         <field name="user_to_review_id"/>
@@ -346,12 +344,17 @@
                    <group col='10' colspan='4'>
                         <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                         <separator orientation="vertical"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
                         <field name="user_to_review_id"/>
                         <field name="user_id" string="Interviewer"/>
                    </group>
+                   <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Survey" icon="terp-personal" domain="[]" context="{'group_by':'survey_id'}"/>
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
                </search>
             </field>
         </record>
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
index 3769efcdfa8..2e06e47505e 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
@@ -7,11 +7,16 @@
             <field name="model">hr.evaluation.reminder</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-             	<form string="Evaluation Reminders">
-			    	<field name="evaluation_id"/>
-			    	<newline/>
-			    	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-              		<button name="send_mail" string="Send Mail" type="object" icon="gtk-ok"/>
+				<form string="Evaluation Reminders">
+					<group width="340">
+					<separator string="Send evaluation reminder" colspan="4"/>
+					<field name="evaluation_id"/>
+					<separator colspan="4"/>
+						<group colspan="4">
+							<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+							<button name="send_mail" string="Send Mail" type="object" icon="gtk-ok"/>
+						</group>
+					</group>
              	</form>
             </field>
 		</record>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 9657b687c18..c97c5d2594d 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -84,7 +84,7 @@
                     <field name="employee_id"/>
 				</group>
 				<newline/>
-                <group expand="1" string="Group By...">
+                <group expand="0" string="Group By...">
                     <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
                     <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
                     <separator orientation="vertical"/>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 3b54631415e..f6527d5c6e8 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -81,12 +81,13 @@
             <field name="res_model">hr.analytic.timesheet</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="hr_timesheet_line_search"/>
         </record>
-		
+
 		<menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
 		<menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
-		
+
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>
             <field name="model">hr.employee</field>
diff --git a/addons/hr_timesheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet/report/hr_timesheet_report_view.xml
index 7f2df2e815e..41fb3520bcc 100644
--- a/addons/hr_timesheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet/report/hr_timesheet_report_view.xml
@@ -59,7 +59,7 @@
                         <field name="date" />
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By...">
+                    <group expand="0" string="Group By...">
                         <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
@@ -93,7 +93,7 @@
         </record>
         <menuitem
             action="action_hr_timesheet_report_stat_all"
-            id="menu_hr_timesheet_report_all" 
+            id="menu_hr_timesheet_report_all"
             parent="menu_hr_reporting_timesheet" sequence="0"/>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index 4c5ed013e1d..b895ace8a60 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -8,19 +8,21 @@
             <field name="model">hr.analytical.timesheet.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Employee Timesheet">
-                	<group colspan="4" >
-	                	<field name="month" />
-	                	<field name="year" />
-	                	<field name="user_id" colspan="3" />
-                	</group>
+				<form string="Employee Timesheet">
+					<group colspan="4">
+					<separator string="This wizard will print monthly timesheet of employee" colspan="4"/>
+						<field name="month"/>
+						<field name="year"/>
+						<field name="user_id" colspan="3"/>
+					</group>
+					<separator colspan="4"/>
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="STOCK_PRINT" string="Print" name="print_report" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-print" string="Print" name="print_report" type="object"/>
                    </group>
-               </form>
-            </field>
-        </record>
+                </form>
+			</field>
+		</record>
 
 		<record id="action_hr_timesheet_employee" model="ir.actions.act_window">
             <field name="name">Employee Timesheet</field>
@@ -44,13 +46,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Print My Timesheet">
-                	<group colspan="4" >
-	                	<field name="month" />
-	                	<field name="year" />
-                	</group>
+                    <group colspan="4">
+                    <separator string="This wizard will print monthly timesheet" colspan="4"/>
+                        <field name="month"/>
+                        <field name="year"/>
+                    </group>
+                    <separator colspan="4"/>
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="STOCK_PRINT" string="Print" name="print_report" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-print" string="Print" name="print_report" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index fa1f4a80c9a..cb51fcc1cb3 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -8,17 +8,21 @@
             <field name="model">hr.analytical.timesheet.users</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Employees Timesheet">
-                	<group colspan="4" >
-	                	<field name="month" />
-	                	<field name="year" />
-	                	<field name="user_ids" colspan="3" />
-                	</group>
-                    <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="STOCK_PRINT" string="Print" name="print_report" type="object"/>
-                   </group>
-               </form>
+				<form string="Employees Timesheet">
+					<group height="260" width="460">
+						<group colspan="4">
+							<separator string="This wizard will print monthly timesheet of employees" colspan="4"/>
+							<field name="month"/>
+							<field name="year"/>
+							<field name="user_ids" colspan="4"/>
+						</group>
+						<separator colspan="4"/>
+						<group colspan="4" col="6">
+							<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+							<button icon="gtk-print" string="Print" name="print_report" type="object"/>
+						</group>
+					</group>
+				</form>
             </field>
         </record>
 
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index b56ecd75769..70104c71ef5 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -116,6 +116,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('to_invoice','&lt;&gt;',False)]</field>
+            <field name="context">{"search_default_user_id":uid}</field>
+     <!--   <field name="search_view_id" ref="account.view_account_analytic_account_search"/> -->
         </record>
         <menuitem
             action="action_hr_analytic_timesheet_open_tree"
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index c9fed4d3e33..58215a087b7 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -490,7 +490,7 @@
             <field name="search_view_id" ref="view_random_timesheet_lines_search"/>
         </record>
          <!--Time Tracking menu in project Management-->
-         <menuitem
+<!--         <menuitem
                 icon="terp-project"
                 id="base.menu_main_pm"
                 name="Project"
@@ -504,14 +504,14 @@
                 action="action_random_timesheet_lines_board"
                 id="menu_project_management_timesheet_lines_board"
                 parent="base.menu_project_management_time_tracking"
-                sequence="7"/>
+                sequence="7"/-->
       <!--<menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board"
-            parent="hr_attendance.menu_hr_time_tracking" groups="hr.group_hr_manager"/>-->
-        <menuitem
+            parent="hr_attendance.menu_hr_time_tracking" groups="hr.group_hr_manager"/>
+           <menuitem
                 action="action_random_timesheet_lines_board"
                 id="menu_hr_action_random_timesheet_lines_board"
                 name="Working Hours"
                 parent="hr_attendance.menu_hr_time_tracking"
-                groups="hr.group_hr_manager" sequence="2"/>
+                groups="hr.group_hr_manager" sequence="2"/>-->
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index 651edf9b2b1..87648a61642 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -7,19 +7,21 @@
             <field name="model">hr.timesheet.analytic.profit</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Timesheet Profit">
-			    <group col="4" colspan="6">
-		    	    <field name="date_from"/>
-				    <field name="date_to"/>
-				    <field name="journal_ids" colspan="4"/>
-				    <field name="employee_ids" colspan="4"/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="STOCK_PRINT"/>
-				</group>
-			</form>
+				<form string="Timesheet Profit">
+					<group height="340" width="480">
+						<group col="4" colspan="6">
+							<field name="date_from"/>
+							<field name="date_to"/>
+							<field name="journal_ids" colspan="4"/>
+							<field name="employee_ids" colspan="4"/>
+						</group>
+						<separator colspan="4"/>
+						<group col="2" colspan="4">
+							<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+							<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+						</group>
+					</group>
+				</form>
             </field>
         </record>
 
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index 7ddf3bc99a7..d71b385c1f8 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -8,27 +8,29 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Invoice analytic lines">
-			    <group col="4" colspan="6">
-			        <notebook>
-			        <page string="Billing Data">
-			            <separator string="Do you want to show details of work in invoice ?" colspan="4"/>
-			            <field name="date"/>
-			            <field name="time"/>
-			            <field name="name"/>
-			            <field name="price"/>
-			            <separator string="Force to use a specific product" colspan="4"/>
-			            <field name="product"/>
-			        </page>
-			        <page string="Filter on Accounts" groups="base.group_extended">
-			            <separator string="Choose accounts you want to invoice" colspan="4"/>
-			            <field name="accounts" colspan="4" nolabel="1"/>
-			        </page>
-			        </notebook>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="do_create" string="Create Invoices" colspan="1" type="object" icon="gtk-execute"/>
+			    <group height="280" width="450">
+				    <group col="4" colspan="6">
+				        <notebook>
+				        <page string="Billing Data">
+				            <separator string="Do you want to show details of work in invoice ?" colspan="4"/>
+				            <field name="date"/>
+				            <field name="time"/>
+				            <field name="name"/>
+				            <field name="price"/>
+				            <separator string="Force to use a specific product" colspan="4"/>
+				            <field name="product"/>
+				        </page>
+				        <page string="Filter on Accounts" groups="base.group_extended">
+				            <separator string="Choose accounts you want to invoice" colspan="4"/>
+				            <field name="accounts" colspan="4" nolabel="1"/>
+				        </page>
+				        </notebook>
+					</group>
+					<separator colspan="4"/>
+				    <group col="2" colspan="4">
+	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+						<button name="do_create" string="Create Invoices" colspan="1" type="object" icon="gtk-execute"/>
+					</group>
 				</group>
 			</form>
             </field>
diff --git a/addons/survey/wizard/survey_answer.xml b/addons/survey/wizard/survey_answer.xml
index edad2ac1add..db2eb1073d9 100644
--- a/addons/survey/wizard/survey_answer.xml
+++ b/addons/survey/wizard/survey_answer.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-	
+
 		<!--
-			Survey Question Wizard 
+			Survey Question Wizard
 		 -->
-		 
+
 		<record id="view_survey_question_message" model="ir.ui.view">
 			<field name="name">Survey Question</field>
 			<field name="model">survey.question.wiz</field>
@@ -28,8 +28,7 @@
 			</field>
 		</record>
 
-		<record id="action_view_survey_question_message"
-			model="ir.actions.act_window">
+		<record id="action_view_survey_question_message" model="ir.actions.act_window">
 			<field name="name">Survey Question</field>
 			<field name="type">ir.actions.act_window</field>
 			<field name="res_model">survey.question.wiz</field>
@@ -38,6 +37,6 @@
 			<field name="target">new</field>
 		</record>
 
-		
+
 	</data>
 </openerp>
\ No newline at end of file

From 917ac72ad0262c6cdc928c11c25ca22a2c75bc11 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 30 Jun 2010 18:19:04 +0530
Subject: [PATCH 17/23] [IMP] procurement: put lable on the schedular wizard

bzr revid: mra@mra-laptop-20100630124904-obhn4dplv7p2oncf
---
 addons/procurement/procurement_view.xml        |  1 +
 .../wizard/orderpoint_procurement_view.xml     | 18 ++++++++++--------
 .../procurement/wizard/schedulers_all_view.xml | 18 ++++++++++--------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 66725547aec..a8fff268b16 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -19,6 +19,7 @@
                     <field name="procure_method"/>
                     <field name="state"/>
                     <field name="message"/>
+                    <field name="name" invisible="1"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml
index a56c46bd299..c8d0d30d1de 100644
--- a/addons/procurement/wizard/orderpoint_procurement_view.xml
+++ b/addons/procurement/wizard/orderpoint_procurement_view.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <!--  Compute Stock Minimum Rules Only -->
-        
+
 		<record id="view_procurement_compute_wizard" model="ir.ui.view">
             <field name="name">Compute Stock Minimum Rules Only</field>
             <field name="model">procurement.orderpoint.compute</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Parameters">
+                <label string="Wizard checks all the stock minimum rules and generate procurement order." colspan="4"/>
+				    <separator colspan="4"/>
 				    <field name="automatic"/>
 				    <separator colspan="4"/>
 				    <group col="2" colspan="4">
@@ -22,13 +24,13 @@
             </field>
         </record>
 
-        <act_window name="Compute Stock Minimum Rules Only"		    
+        <act_window name="Compute Stock Minimum Rules Only"
 		    res_model="procurement.orderpoint.compute"
 		    src_model="procurement.order"
 		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
-		    id="action_procurement_compute"/>        
-		
+		    target="new"
+            key2="client_action_multi"
+		    id="action_procurement_compute"/>
+
 	</data>
-</openerp>	
+</openerp>
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index 4af54b7409e..40c72ee68c7 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <!--  Compute Schedulers -->
-        
+
 		<record id="view_compute_schedulers_wizard" model="ir.ui.view">
             <field name="name">Compute Schedulers</field>
             <field name="model">procurement.order.compute.all</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scheduler Parameters">
+                <label string="Wizard run all the procurements, and generate task, production order or purchase order based on the product type" colspan="4"/>
+				    <separator colspan="4"/>
 				    <field name="automatic"/>
 				    <separator colspan="4"/>
 				    <group col="2" colspan="4">
@@ -22,13 +24,13 @@
             </field>
         </record>
 
-         <act_window name="Compute Schedulers"		    
+         <act_window name="Compute Schedulers"
 		    res_model="procurement.order.compute.all"
 		    src_model="procurement.order"
 		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
-		    id="action_compute_schedulers"/>            
-        
+		    target="new"
+            key2="client_action_multi"
+		    id="action_compute_schedulers"/>
+
 	</data>
-</openerp>	
+</openerp>

From 1b171756d16752f9d52412bc4d9d8950f3dba6a1 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 30 Jun 2010 17:19:35 +0200
Subject: [PATCH 18/23] [IMP] wiki: minor improvements to usability

bzr revid: odo@openerp.com-20100630151935-cfri7cvs1z6jxvfq
---
 addons/wiki/wiki.py                         | 42 ++++++---------------
 addons/wiki/wiki_view.xml                   |  9 +----
 addons/wiki_faq/wiki_faq.xml                | 10 ++---
 addons/wiki_sale_faq/wiki_sale_faq_data.xml |  5 ++-
 4 files changed, 21 insertions(+), 45 deletions(-)

diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index a9b623611b8..a0c72825859 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -32,7 +32,6 @@ import difflib
 
 class Wiki(osv.osv):
     """ wiki """
-
     _name = "wiki.wiki"
 
 Wiki()
@@ -78,7 +77,7 @@ class GroupLink(osv.osv):
 GroupLink()
 
 
-class Wiki(osv.osv):
+class Wiki2(osv.osv):
     """ Wiki Page """
 
     _inherit = "wiki.wiki"
@@ -87,19 +86,22 @@ class Wiki(osv.osv):
 
     _columns = {
         'name': fields.char('Title', size=256, select=True, required=True),
-        'write_uid': fields.many2one('res.users', "Last Author"),
+        'write_uid': fields.many2one('res.users', "Last Author", select=True),
         'text_area': fields.text("Content"),
         'create_uid': fields.many2one('res.users', 'Author', select=True),
         'create_date': fields.datetime("Created on", select=True),
         'write_date': fields.datetime("Modification Date", select=True),
-        'tags': fields.char('Tags', size=1024),
+        'tags': fields.char('Tags', size=1024, select=True),
         'history_id': fields.one2many('wiki.wiki.history', 'wiki_id', 'History Lines'),
         'minor_edit': fields.boolean('Minor edit', select=True),
         'summary': fields.char('Summary', size=256),
-        'section': fields.char('Sequence', size=32, help="Use page section code like 1.2.1"),
-        'group_id': fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null'),
-        'toc': fields.boolean('Table of Contents'),
-        'review': fields.boolean('Need Review'),
+        'section': fields.char('Section', size=32, help="Use page section code like 1.2.1", select=True),
+        'group_id': fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null', 
+            help="Topic, also called Wiki Group"),
+        'toc': fields.boolean('Table of Contents', 
+            help="Indicates that this pages is a table of contents (linking to other pages)"),
+        'review': fields.boolean('Needs Review', select=True, 
+            help="Indicates that this page should be reviewed, raising the attention of other contributors"),
         'parent_id': fields.many2one('wiki.wiki', 'Parent Page'),
         'child_ids': fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'),
     }
@@ -176,29 +178,7 @@ class Wiki(osv.osv):
                 history.create(cr, uid, res)
         return result
 
-    def open_wiki_page(self, cr, uid, ids, context):
-
-        """ Opens Wiki Page for Editing
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of wiki page’s IDs
-
-        """
-        pages = self.pool.get('wiki.wiki').search(cr, uid, [('name', '=', 'Basic Wiki Editing')])
-        if not pages:
-           raise osv.except_osv(_('Warning !'), _("No Help page is defined"))
-        value = {
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'wiki.wiki',
-            'view_id': False,
-            'res_id': pages[0],
-            'type': 'ir.actions.act_window',
-            'nodestroy': True,
-        }
-        return value
-
-Wiki()
+Wiki2()
 
 
 class History(osv.osv):
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index c1baa5cda20..a87341785d3 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -123,14 +123,9 @@
             <field name="arch" type="xml">
                 <form string="Wiki">
                     <group col="8" colspan="4">
-                        <field name="name" select="1" colspan="6"/>
-                        <button name="open_wiki_page" type="object"
-                        string="Basic Wiki Editing" icon="gtk-ok" />
-                    </group>
-                    <group col="8" colspan="4">
+                        <field name="name" select="1" colspan="8"/>
                         <field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/>
                         <field name="section" invisible="not context.get('section',False)"/>
-<!--                        <field name="parent_id"/>-->
                     </group>
                     <notebook colspan="4">
                         <page string="Content">
@@ -144,7 +139,6 @@
                         <field name="review" select="1"/>
                         <field name="tags" select="1" groups="base.group_extended"/>
                         <field name="toc"/>
-<!--                        <field name="summary" colspan="4" groups="base.group_extended"/>-->
                     </group>
                 </form>
             </field>
@@ -165,7 +159,6 @@
                     <field name="group_id" select="1"/>
                     <field name="write_uid" select="1"/>
                     <field name="write_date" select="1"/>
-                    <field name="review" select="1"/>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="8" col="6">
                         <filter icon="terp-check" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>
diff --git a/addons/wiki_faq/wiki_faq.xml b/addons/wiki_faq/wiki_faq.xml
index fdb93660682..1926efd33f7 100644
--- a/addons/wiki_faq/wiki_faq.xml
+++ b/addons/wiki_faq/wiki_faq.xml
@@ -9,9 +9,11 @@
 
 == Answer ==
 
+
+
 == External Links ==
 
-            </field>
+</field>
         </record>
         <record id="wiki_wiki_bugs" model="wiki.wiki">
             <field name="name">Bug Tracker ?</field>
@@ -48,8 +50,7 @@ Integration Benefits:
 
 * The Open ERP Website: [http://openerp.com]
 * The DMS Documentation: [http://openerp.com]
-
-            </field>
+</field>
         </record>
         <record id="wiki_wiki_dms" model="wiki.wiki">
             <field name="name">Document Management System ?</field>
@@ -88,8 +89,7 @@ Integration Benefits:
 
 * The Open ERP Website : [http://openerp.com]
 * The DMS Documentation : [http://openerp.com]
-
-            </field>
+</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/wiki_sale_faq/wiki_sale_faq_data.xml b/addons/wiki_sale_faq/wiki_sale_faq_data.xml
index 4a8eea1cb38..a349f77404f 100644
--- a/addons/wiki_sale_faq/wiki_sale_faq_data.xml
+++ b/addons/wiki_sale_faq/wiki_sale_faq_data.xml
@@ -14,11 +14,14 @@
             <field eval="2" name="section"/>
             <field name="template">== Question ==
 
+
 == Answer ==
 
+
+
 == External Links ==
 
-            </field>
+</field>
         </record>
 
     

From 9fb2b72dc6076edd358a6eccff9b3f804733d06a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 30 Jun 2010 17:21:41 +0200
Subject: [PATCH 19/23] [IMP] wiki: minor improvements to usability

bzr revid: odo@openerp.com-20100630152141-qesnu579rxynoxgl
---
 addons/wiki/wiki.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index a0c72825859..3fe9d25fcc5 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -86,7 +86,7 @@ class Wiki2(osv.osv):
 
     _columns = {
         'name': fields.char('Title', size=256, select=True, required=True),
-        'write_uid': fields.many2one('res.users', "Last Author", select=True),
+        'write_uid': fields.many2one('res.users', "Last Contributor", select=True),
         'text_area': fields.text("Content"),
         'create_uid': fields.many2one('res.users', 'Author', select=True),
         'create_date': fields.datetime("Created on", select=True),

From 8b8b79f38f63ff8340f98fce33b6e3f3ca2c0af4 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 30 Jun 2010 17:31:15 +0200
Subject: [PATCH 20/23] [IMP] wiki: further minor cleanup

bzr revid: odo@openerp.com-20100630153115-y7fd7z5xr68oc8u3
---
 addons/wiki/data/wiki_main.xml       | 2 ++
 addons/wiki/data/wiki_quickstart.xml | 2 ++
 addons/wiki/wiki_view.xml            | 5 ++---
 addons/wiki_faq/wiki_faq.xml         | 4 ++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/addons/wiki/data/wiki_main.xml b/addons/wiki/data/wiki_main.xml
index 772528f0949..5aa94eb0ae3 100644
--- a/addons/wiki/data/wiki_main.xml
+++ b/addons/wiki/data/wiki_main.xml
@@ -6,6 +6,8 @@
             <field name="tags">help, quick start, wiki, formatting</field>
             <field name="minor_edit">0</field>
             <field name="section">1</field>
+            <field name="create_uid" eval="1"/>
+            <field name="write_uid" eval="1"/>
             <field name="toc">0</field>
             <field name="summary">Initial Page</field>
             <field  name="text_area">=The Open ERP wiki=
diff --git a/addons/wiki/data/wiki_quickstart.xml b/addons/wiki/data/wiki_quickstart.xml
index 665179114ce..defd3a315df 100644
--- a/addons/wiki/data/wiki_quickstart.xml
+++ b/addons/wiki/data/wiki_quickstart.xml
@@ -8,6 +8,8 @@
 		<record id="wiki_wiki_quickstart0" model="wiki.wiki">
 			<field name="name">Basic Wiki Editing</field>
 			<field name="tags">help, quick start, wiki, formatting</field>
+            <field name="create_uid" eval="1"/>
+            <field name="write_uid" eval="1"/>
 			<field name="minor_edit">0</field>
 			<field name="toc">1</field>
 			<field name="section">1.1</field>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index a87341785d3..5a0a3d557bf 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -129,7 +129,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Content">
-                        <separator colspan="4" string="Informations"/>
+                        <separator colspan="4" string="Page Content"/>
                         <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
                         </page>
                     </notebook>
@@ -163,7 +163,7 @@
                     <group expand="0" string="Group By..." colspan="8" col="6">
                         <filter icon="terp-check" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>
                         <filter icon="terp-personal" string="Author" domain="[]" context="{'group_by':'create_uid'}"/>
-                        <filter icon="terp-personal-" string="Last Author" domain="[]" context="{'group_by':'write_uid'}"/>
+                        <filter icon="terp-personal-" string="Last Contributor" domain="[]" context="{'group_by':'write_uid'}"/>
                     </group>
                 </search>
             </field>
@@ -177,7 +177,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_wiki_tree"/>
-<!--            <field name="context">{'section':'1','search_default_create_uid':uid}</field>-->
             <field name="search_view_id" ref="view_wiki_filter"/>
         </record>
 
diff --git a/addons/wiki_faq/wiki_faq.xml b/addons/wiki_faq/wiki_faq.xml
index 1926efd33f7..1e89e4909b0 100644
--- a/addons/wiki_faq/wiki_faq.xml
+++ b/addons/wiki_faq/wiki_faq.xml
@@ -19,6 +19,8 @@
             <field name="name">Bug Tracker ?</field>
             <field name="tags">crm, bugs</field>
             <field name="group_id" ref="wiki_groups_faq"/>
+            <field name="create_uid" eval="1"/>
+            <field name="write_uid" eval="1"/>
             <field name="minor_edit">0</field>
             <field name="toc">0</field>
             <field name="review">1</field>
@@ -56,6 +58,8 @@ Integration Benefits:
             <field name="name">Document Management System ?</field>
             <field name="tags">dms, document</field>
             <field name="group_id" ref="wiki_groups_faq"/>
+            <field name="create_uid" eval="1"/>
+            <field name="write_uid" eval="1"/>
             <field name="minor_edit">0</field>
             <field name="toc">1</field>
             <field name="section">1</field>

From 497a0bde1c47d8066207589bd399ea1937d6fe71 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 30 Jun 2010 20:11:48 +0200
Subject: [PATCH 21/23] [IMP] crm, mail_gateway: improved charset handling

bzr revid: odo@openerp.com-20100630181148-zjl2oxqxuh1x1hbm
---
 addons/crm/wizard/crm_send_email.py | 32 ++++++++++++++---------------
 addons/mail_gateway/mail_gateway.py |  6 ++----
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 01e14375d89..e158c2177b8 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -170,17 +170,17 @@ class crm_send_new_email(osv.osv_memory):
 
         for case in mod_obj.browse(cr, uid, res_id):
             if 'email_to' in fields:
-                res.update({'email_to': case.email_from})
+                res.update({'email_to': tools.ustr(case.email_from)})
             if 'email_from' in fields:
-                res.update({'email_from': user_mail_from})
+                res.update({'email_from': tools.ustr(user_mail_from)})
             if 'subject' in fields:
                 res.update({'subject': tools.ustr(context.get('subject', case.name) or '')})
             if 'email_cc' in fields:
-                res.update({'email_cc': case.email_cc or ''})
+                res.update({'email_cc': tools.ustr(case.email_cc or '')})
             if 'text' in fields:
-                res.update({'text': '\n\n'+(case.user_id.signature or '')})
+                res.update({'text': u'\n\n'+(tools.ustr(case.user_id.signature or ''))})
             if 'state' in fields:
-                res.update({'state': 'pending'})
+                res.update({'state': u'pending'})
 
         return res
 
@@ -207,28 +207,28 @@ class crm_send_new_email(osv.osv_memory):
             res_id = hist.res_id
             case = model_pool.browse(cr, uid, res_id)
             if 'email_to' in fields:
-                res.update({'email_to': hist.email_from or False})
+                res.update({'email_to': case.email_from and tools.ustr(case.email_from) or False})
             if 'email_from' in fields:
-                res.update({'email_from': user_mail_from})
+                res.update({'email_from': user_mail_from and tools.ustr(user_mail_from) or False})
 
-            signature = '\n' + (case.user_id.signature or '')
+            signature = u'\n' + (tools.ustr(case.user_id.signature or ''))
             original = [signature]
 
             if include_original == True and 'text' in fields:
-                header = '-------- Original Message --------'
-                sender = 'From: %s' %(hist.email_from or '')
-                to = 'To: %s' % (hist.email_to or '')
-                sentdate = 'Date: %s' % (hist.date)
-                desc = '\n%s'%(hist.description)
+                header = u'-------- Original Message --------'
+                sender = u'From: %s' %(tools.ustr(hist.email_from or ''))
+                to = u'To: %s' % (tools.ustr(hist.email_to or ''))
+                sentdate = u'Date: %s' % (tools.ustr(hist.date))
+                desc = u'\n%s'%(tools.ustr(hist.description))
 
                 original = [header, sender, to, sentdate, desc, signature]
 
-            res['text']= '\n\n\n' + '\n'.join(original)
+            res['text']= u'\n\n\n' + u'\n'.join(original)
 
             if 'subject' in fields:
-                res.update({'subject': 'Re: %s' %(hist.name or '')})
+                res.update({u'subject': u'Re: %s' %(tools.ustr(hist.name or ''))})
             if 'state' in fields:
-                res['state']='pending'
+                res['state'] = u'pending'
         return res
 
     def view_init(self, cr, uid, fields_list, context=None):
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index cdd1c61ee67..95b95489c6b 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -371,16 +371,14 @@ class mailgate_tool(osv.osv_memory):
                         if part.get_content_subtype() == 'html':
                             body = tools.ustr(tools.html2plaintext(content))
                         elif part.get_content_subtype() == 'plain':
-                            body = tools.ustr(content)
+                            body = content
                 elif part.get_content_maintype() in ('application', 'image', 'text'):
                     filename = part.get_filename();
                     if filename :
                         attachments[filename] = part.get_payload(decode=True)
                     else:
                         res = part.get_payload(decode=True)
-                        if encoding:
-                            res = tools.ustr(res, encoding)
-                        body += res
+                        body += tools.ustr(res)
 
             msg['body'] = body
             msg['attachments'] = attachments

From 887a3d05320a148f5b03ce6d14144d0e7cb55a6a Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 1 Jul 2010 00:18:04 +0530
Subject: [PATCH 22/23] [REF]

bzr revid: jvo@tinyerp.com-20100630184804-ak0s2cka7yofcw84
---
 addons/mrp/mrp.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index f165c231a1d..9ed07cb5f38 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -20,8 +20,7 @@
 ##############################################################################
 
 from mx import DateTime
-from osv import fields
-from osv import osv
+from osv import osv, fields
 from tools.translate import _
 import ir
 import netsvc
@@ -520,8 +519,8 @@ class mrp_production(osv.osv):
                 raise osv.except_osv(_('Invalid action !'), _('Cannot delete Production Order(s) which are in %s State!' % s['state']))
         return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
 
-    def copy(self, cr, uid, id, default=None,context=None):
-        if not default:
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
             default = {}
         default.update({
             'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.production'),

From 7394de40699f665152f6be477eab1fb15eb175bc Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Thu, 1 Jul 2010 04:45:09 +0100
Subject: [PATCH 23/23] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100701034509-e5uz28hb1xgj0mpe
---
 addons/account/i18n/es.po       | 2 +-
 addons/hr_evaluation/i18n/es.po | 2 +-
 addons/survey/i18n/es.po        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index 391db02e8d6..c06407ce158 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-30 03:34+0000\n"
+"X-Launchpad-Export-Date: 2010-07-01 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/hr_evaluation/i18n/es.po b/addons/hr_evaluation/i18n/es.po
index 5dd4b64fb11..87a362033f9 100644
--- a/addons/hr_evaluation/i18n/es.po
+++ b/addons/hr_evaluation/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-30 03:34+0000\n"
+"X-Launchpad-Export-Date: 2010-07-01 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
diff --git a/addons/survey/i18n/es.po b/addons/survey/i18n/es.po
index 76d1e5a66eb..3b860411c3b 100644
--- a/addons/survey/i18n/es.po
+++ b/addons/survey/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-30 03:34+0000\n"
+"X-Launchpad-Export-Date: 2010-07-01 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: survey