diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml
index 1f29782b7ea..6f1cac05102 100644
--- a/addons/account/report/invoice.rml
+++ b/addons/account/report/invoice.rml
@@ -238,7 +238,7 @@
       <tr>
         <td><para style="P8"><font color="white"> </font></para></td>
         <td>
-          <para style="terp_default_8">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_8">[[ o.partner_id.name ]] [[ o.partner_id.title or '' ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.street ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.street2 or '' ]]</para>
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index e8f1cee42f3..950a84fc637 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -191,7 +191,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_id.name ]] [[ o.partner_id.title or '' ]] </para>
           <para style="terp_default_9">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
           <para style="terp_default_9">[[ o.address_invoice_id.street ]]</para>
           <para style="terp_default_9">[[ o.address_invoice_id.street2 or '' ]]</para>
diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
index 133fffe5c0f..7eaae14497f 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -195,7 +195,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_id.name ]] [[ o.partner_id.title or '' ]]</para>
           <para style="terp_default_9">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
           <para style="terp_default_9">[[ o.address_invoice_id.street ]]</para>
           <para style="terp_default_9">[[ o.address_invoice_id.street2 or '' ]]</para>
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 594133d3b12..108004d4a93 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -31,7 +31,6 @@ If you don't think you need any of these right now, you can easily install them
             <field name="report_designer"/> <field name="thunderbird"/>
             <separator string="Vertical Modules" colspan="4"/>
             <field name="profile_association"/>
-            <field name="profile_training"/>
             <field name="profile_auction"/>
             <field name="profile_bookstore"/>
           </group>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 9a817eaf10e..07c95957176 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -79,10 +79,6 @@ class base_setup_installer(osv.osv_memory):
             help="Installs a preselected set of OpenERP "
                  "applications which will help you manage your association "
                  "more efficiently."),
-        'profile_training':fields.boolean('Training Centers',
-            help="Helps you manage your training sessions and "
-                 "centers, from the conception of a training project to the "
-                 "gathering of trainee feedback."),
         'profile_auction':fields.boolean('Auction Houses',
             help="Installs a preselected set of OpenERP "
                  "applications selected to help you manage your auctions "
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index b3e45a33978..f9ec0e7d315 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -75,6 +75,7 @@ between mails and Open ERP.""",
         'wizard/crm_opportunity_to_phonecall_view.xml',
         'wizard/crm_partner_to_opportunity_view.xml',
 
+        'wizard/crm_forward_to_partner_view.xml',
         'wizard/crm_send_email_view.xml',
         'wizard/crm_email_add_cc_view.xml',
         'crm_view.xml',
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 85a27bb5d55..b0515a3fa13 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -34,15 +34,15 @@ AVAILABLE_STATES = [
     ('open', 'Open'), 
     ('cancel', 'Cancelled'), 
     ('done', 'Closed'), 
-    ('pending', 'Pending')
+    ('pending', 'Pending'),
 ]
 
 AVAILABLE_PRIORITIES = [
-    ('5', 'Lowest'), 
-    ('4', 'Low'), 
-    ('3', 'Normal'), 
+    ('1', 'Highest'),
     ('2', 'High'), 
-    ('1', 'Highest')
+    ('3', 'Normal'), 
+    ('4', 'Low'), 
+    ('5', 'Lowest'), 
 ]
 
 class crm_case_section(osv.osv):
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 03318270e9b..f89c558fee4 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -174,15 +174,20 @@
                                 icon="gtk-undo" type="action" />
                         </form>
                         <tree string="Communication history">
-                            <field name="description"/>
-                            <field name="email_to"/>
+                            <field name="name" />
                             <field name="date"/>
+                            <field name="email_from" />
+                            <field name="email_to"/>
+                            <field name="description"/>
                         </tree>
                     </field>
-                    <button colspan="4" string="Send New Email"
+                    <button colspan="2" string="Send New Email"
                         name="%(action_crm_send_mail)d"
                         context="{'mail':'new', 'model': 'crm.lead'}"
                         icon="gtk-go-forward" type="action" />
+                    <button colspan="2" string="Forward to Partner"
+                        name="%(crm_lead_forward_to_partner_act)d"
+                        icon="gtk-go-forward" type="action" />
                  </page>
 
                 </notebook>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index f3d92447acd..a9067d9fa0b 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import crm_send_email
+import crm_forward_to_partner
 import crm_email_add_cc
 
 import crm_lead_to_partner
diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
new file mode 100644
index 00000000000..3af1e592a9f
--- /dev/null
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -0,0 +1,160 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+
+from tools.translate import _
+import tools
+
+class crm_lead_forward_to_partner(osv.osv_memory):
+    _name = 'crm.lead.forward.to.partner'
+
+    _columns = {
+        'partner_id' : fields.many2one('res.partner', 'Partner'),
+        'address_id' : fields.many2one('res.partner.address', 'Address'),
+        'email_from' : fields.char('From', required=True, size=128),
+        'email_to' : fields.char('To', required=True, size=128),
+        'subject' : fields.char('Subject', required=True, size=128),
+        'message' : fields.text('Message', required=True),
+    }
+
+    def on_change_partner(self, cr, uid, ids, partner_id):
+        return {
+            'domain' : {
+                'address_id' : partner_id and "[('partner_id', '=', partner_id)]" or "[]",
+            }
+        }
+
+    def on_change_address(self, cr, uid, ids, address_id):
+        email = ''
+        if address_id:
+            email = self.pool.get('res.partner.address').browse(cr, uid, address_id).email
+
+        return {
+            'value' : {
+                'email_to' : email,
+            }
+        }
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return {'type' : 'ir.actions.act_window_close'}
+
+    def action_forward(self, cr, uid, ids, context=None):
+        """
+        Forward the lead to a partner
+        """
+        if context is None:
+            context = {}
+
+        res_id = context.get('active_id', False)
+
+        if not res_id:
+            return {}
+
+        this = self.browse(cr, uid, ids[0], context=context)
+
+        hist_obj = self.pool.get('crm.case.history')
+        smtp_pool = self.pool.get('email.smtpclient')
+        case_pool = self.pool.get('crm.lead')
+        case = case_pool.browse(cr, uid, res_id, context=context)
+
+        emails = [this.email_to]
+        body = case_pool.format_body(this.message)
+        email_from = this.email_from or False
+        case_pool._history(cr, uid, [case], _('Forward'), history=True, email=this.email_to, details=body, email_from=email_from)
+
+        flag = False
+        if case.section_id and case.section_id.server_id:
+            flag = smtp_pool.send_email(
+                cr=cr,
+                uid=uid,
+                server_id=case.section_id.server_id.id,
+                emailto=emails,
+                subject=this.subject,
+                body="<pre>%s</pre>" % body,
+            )
+        else:
+            flag = tools.email_send(
+                email_from,
+                emails,
+                this.subject,
+                body,
+            )
+
+        return {}
+
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        This function gets default values
+        """
+        if context is None:
+            context = {}
+
+        active_ids = context.get('active_ids')
+        if not active_ids:
+            return {}
+
+        lead_proxy = self.pool.get('crm.lead')
+
+        lead = lead_proxy.browse(cr, uid, active_ids[0], context=context)
+
+        field_names = [
+            'partner_name', 'title', 'function_name', 'street', 'street2',
+            'zip', 'city', 'country_id', 'state_id', 'email_from',
+            'phone', 'fax', 'mobile'
+        ]
+
+        message = []
+
+        for field_name in field_names:
+            field_definition = lead_proxy._columns[field_name]
+            value = None
+
+            if field_definition._type == 'selection':
+                if hasattr(field_definition.selection, '__call__'):
+                    key = field_definition.selection(lead_proxy, cr, uid, context=context)
+                else:
+                    key = field.definition.selection
+                value = dict(key).get(lead[field_name], lead[field_name])
+            elif field_definition._type == 'many2one':
+                if lead[field_name]:
+                    value = lead[field_name].name_get()[0][1]
+            else:
+                value = lead[field_name]
+
+            message.append("%s: %s" % (field_definition.string, value or ''))
+
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        email_from = ''
+        if user.address_id and user.address_id.email:
+            email_from = "%s <%s>" % (user.name, user.address_id.email)
+
+        res = {
+            'email_from' : email_from,
+            'subject' : '[Lead-Forward:%06d] %s' % (lead.id, lead.name),
+            'message' : "\n".join(message + ['---']),
+        }
+
+        return res
+
+crm_lead_forward_to_partner()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_forward_to_partner_view.xml b/addons/crm/wizard/crm_forward_to_partner_view.xml
new file mode 100644
index 00000000000..15a75ca3551
--- /dev/null
+++ b/addons/crm/wizard/crm_forward_to_partner_view.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="crm_lead_forward_to_partner_form">
+            <field name="name">crm_lead_forward_to_partner</field>
+            <field name="model">crm.lead.forward.to.partner</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Forward to Partner">
+                    <separator string="User" colspan="4" />
+                    <field name="email_from" colspan="4" />
+
+                    <separator string="Destination" colspan="4" />
+                    <field name="partner_id" on_change="on_change_partner(partner_id)" colspan="4" />
+                    <field name="address_id" string="Contact" on_change="on_change_address(address_id)" colspan="4" />
+                    <field name="email_to" colspan="4" />
+
+                    <separator string="Email" colspan="4" />
+                    <field name="subject" colspan="4" />
+                    <field name="message" colspan="4" />
+                    <separator string="" colspan="4" />
+                    <group colspan="4" col="2">
+                        <button name="action_cancel" special="cancel" string="Cancel" icon="gtk-cancel" type="object" />
+                        <button name="action_forward" string="Forward" icon="gtk-go-forward" type="object" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="crm_lead_forward_to_partner_act">
+            <field name="name">Forward to Partner</field>
+            <field name="res_model">crm.lead.forward.to.partner</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index a0f91fb2ae5..b0d20cd6e55 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -76,7 +76,8 @@ class crm_send_new_email(osv.osv_memory):
             
             case = case_pool.browse(cr, uid, res_id)
             if context.get('mail', 'new') == 'new':
-                message_id = case.history_line[0].message_id
+                if len(case.history_line):
+                    message_id = case.history_line[0].message_id
             else:
                 hist = hist_obj.browse(cr, uid, res_id)
                 message_id = hist.message_id
@@ -92,9 +93,11 @@ class crm_send_new_email(osv.osv_memory):
             case_pool._history(cr, uid, [case], _('Send'), history=True, email=data['email_to'], details=body, email_from=email_from, message_id=message_id)
 
             x_headers = {
-                'References':"%s" % (message_id),
                 'Reply-To':"%s" % case.section_id.reply_to,
             }
+            if message_id:
+                x_headers['References'] = "%s" % (message_id)
+
             flag = False
             if case.section_id and case.section_id.server_id:
                 flag = smtp_pool.send_email(
@@ -159,13 +162,15 @@ class crm_send_new_email(osv.osv_memory):
             if 'email_from' in fields:
                 res.update({'email_from': (case.section_id and case.section_id.reply_to) or \
                             (case.user_id and case.user_id.address_id and \
-                            case.user_id.address_id.email) or tools.config.get('email_from',False)})
+                             case.user_id.address_id.email and \
+                             "%s <%s>" % (case.user_id.name, case.user_id.address_id.email)) or \
+                            tools.config.get('email_from',False)})
             if 'subject' in fields:
                 res.update({'subject': '[%s] %s' %(str(case.id), case.name or '')})
             if 'email_cc' in fields:
                 res.update({'email_cc': case.email_cc or ''})
             if 'text' in fields:
-                res.update({'text': '\n\n'+(case.user_id.signature or '') + '\n\n' +  (case.description or '')})
+                res.update({'text': '\n\n'+(case.user_id.signature or '')})
             if 'state' in fields:
                 res.update({'state': 'pending'})
         return res
diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
index 4db670de61f..49758245eb0 100644
--- a/addons/crm/wizard/crm_send_email_view.xml
+++ b/addons/crm/wizard/crm_send_email_view.xml
@@ -20,11 +20,11 @@
                         </page>
                         <page string="Attachments">
                             <field name="doc1" filename="doc1_fname"/>
-                            <field name="doc1_fname"/>
+                            <field name="doc1_fname" invisible="1" />
                             <field name="doc2" filename="doc2_fname" />
-                            <field name="doc2_fname"/>
+                            <field name="doc2_fname" invisible="1" />
                             <field name="doc3" filename="doc3_fname" />
-                            <field name="doc3_fname"/>
+                            <field name="doc3_fname" invisible="1" />
                         </page>
                     </notebook>
                     <group colspan="2" col="4" >
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 3639decf3dc..598ed4aad6f 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -339,10 +339,6 @@ class email_server(osv.osv):
     
     def fetch_mail(self, cr, uid, ids, context={}):
 
-        fp = os.popen('ping www.google.com -c 1 -w 5',"r")
-        if not fp.read():
-            logger.notifyChannel('imap', netsvc.LOG_WARNING, 'lost internet connection !')
-
         for server in self.browse(cr, uid, ids, context):
             logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name))
             
diff --git a/addons/l10n_ch/report/bvr.rml b/addons/l10n_ch/report/bvr.rml
index caaa585d835..a3eed479be9 100755
--- a/addons/l10n_ch/report/bvr.rml
+++ b/addons/l10n_ch/report/bvr.rml
@@ -81,7 +81,7 @@
           </para>
         </td>
         <td>
-          <para style="P10">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="P10">[[ o.partner_id.name ]] [[ o.partner_id.title or '' ]]</para>
           <para style="P10">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
           <para style="P10">[[ o.address_invoice_id.street ]]</para>
           <para style="P10">[[ o.address_invoice_id.street2 or '' ]]</para>
@@ -164,4 +164,4 @@
 	<drawRightString x="195mm" y="15mm">[[mod10r('01'+str('%.2f' % o.amount_total).replace('.','').rjust(10,'0'))]]&gt;[[ _get_ref(o) ]]+ [[o.partner_bank.bvr_number.split('-')[0]+(str(o.partner_bank.bvr_number.split('-')[1])).rjust(6,'0')+o.partner_bank.bvr_number.split('-')[2] ]]&gt;</drawRightString>
 	</illustration>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/l10n_ch/report/invoice.rml b/addons/l10n_ch/report/invoice.rml
index ce5ef808f2a..104fbf2a367 100755
--- a/addons/l10n_ch/report/invoice.rml
+++ b/addons/l10n_ch/report/invoice.rml
@@ -155,7 +155,7 @@
           </para>
         </td>
         <td>
-          <para style="P18">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="P18">[[ o.partner_id.name ]] [[ o.partner_id.title or '' ]]</para>
           <para style="P18">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
           <para style="P18">[[ o.address_invoice_id.street ]]</para>
           <para style="P18">[[ o.address_invoice_id.street2 or '' ]]</para>
@@ -380,4 +380,4 @@
 	</illustration>
 
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/olap_sale/i18n/es.po b/addons/olap_sale/i18n/es.po
new file mode 100644
index 00000000000..320a945f712
--- /dev/null
+++ b/addons/olap_sale/i18n/es.po
@@ -0,0 +1,34 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:29+0000\n"
+"PO-Revision-Date: 2010-04-28 19:27+0000\n"
+"Last-Translator: Shay <Unknown>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-29 03:52+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_sale
+#: model:ir.module.module,description:olap_sale.module_meta_information
+msgid ""
+"\n"
+"    Sale module will load the data in olap tables\n"
+"    "
+msgstr ""
+"\n"
+"    El módulo de ventas cargará los datos en una tabla olap\n"
+"    "
+
+#. module: olap_sale
+#: model:ir.module.module,shortdesc:olap_sale.module_meta_information
+msgid "olap_sale"
+msgstr ""
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index 1e88cf50e12..58594493643 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -8,12 +8,12 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="priority">36</field>
             <field name="arch" type="xml">
-                <group name="sale_list" position="after" groups="base.group_extended">
-                    <group colspan="2" col="2" groups="base.group_extended">
+                <page string="Sales &amp; Purchases" position="inside">
+                    <group colspan="4" col="2" groups="base.group_extended">
                         <separator string="Purchases Properties" colspan="2"/>
-                        <field name="property_product_pricelist_purchase"/>
+                        <field name="property_product_pricelist_purchase" />
                     </group>
-                </group>
+                </page>
             </field>
         </record>
 
diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index a9713776b4f..cd3e0dfb8fa 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -155,7 +155,7 @@
               <td>
                 <para style="terp_default_9">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
                 <para style="terp_default_Bold_9">Shipping address :</para>
-                <para style="P1">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+                <para style="P1">[[ o.partner_id.name ]] [[ o.partner_id.title or '' ]]</para>
                 <para style="P1">[[ addr.title or '' ]] [[ addr.name ]]</para>
                 <para style="P1">[[ addr.street ]]</para>
                 <para style="P1">[[ addr.street2 or '' ]]</para>
@@ -175,7 +175,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_id.name ]] [[ o.partner_id.title or '' ]]</para>
           <para style="terp_default_9">[[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_address_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_address_id.street2 or '' ]]</para>
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index c5f083bbf05..961ce8239b4 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -88,7 +88,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ (order.partner_id and order.partner_id.title) or '' ]] [[ order.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ order.partner_id.name ]] [[ order.partner_id.title or '' ]]</para>
           <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.title) or '' ]] [[ order.partner_address_id.name ]] </para>
           <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.street) or '']] [[ order.partner_address_id.street2 ]]</para>
           <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.zip) or '' ]] [[ (order.partner_address_id and order.partner_address_id.city) or '' ]]</para>
diff --git a/addons/report_intrastat/report/invoice.rml b/addons/report_intrastat/report/invoice.rml
index 89b6448072e..4c3bfd5d2c4 100644
--- a/addons/report_intrastat/report/invoice.rml
+++ b/addons/report_intrastat/report/invoice.rml
@@ -245,7 +245,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_8">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_8">[[ o.partner_id.name ]] [[ o.partner_id.title or '' ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.street ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.street2 or '' ]]</para>
diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml
index fa03eb1624b..1c205b6c256 100644
--- a/addons/sale/report/order.rml
+++ b/addons/sale/report/order.rml
@@ -134,7 +134,7 @@
       <tr>
         <td>
           <para style="terp_default_Bold_9">Shipping address :</para>
-          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_id.name ]] [[ o.partner_id.title or '' ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.title or '' ]] [[ o.partner_shipping_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.street2 or '' ]]</para>
@@ -155,7 +155,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_id.name ]] [[ o.partner_id.title or '' ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.title or '' ]] [[ o.partner_order_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.street2 or '' ]]</para>
diff --git a/addons/smtpclient/i18n/ca.po b/addons/smtpclient/i18n/ca.po
index 5bbd228f8ba..5caaa7b3da4 100644
--- a/addons/smtpclient/i18n/ca.po
+++ b/addons/smtpclient/i18n/ca.po
@@ -1,20 +1,20 @@
-# Translation of OpenERP Server.
-# This file containt the translation of the following modules:
-#	* smtpclient
+# Catalan translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0-rc1\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-26 06:00+0000\n"
-"PO-Revision-Date: 2010-01-19 05:22+0000\n"
-"Last-Translator: Jordi Esteve - http://www.zikzakmedia.com "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-04-28 15:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-25 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-29 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: smtpclient
@@ -854,15 +854,3 @@ msgstr "res.company.address"
 #: field:email.smtpclient.queue,state:0
 msgid "Message Status"
 msgstr ""
-
-#~ msgid "The Email is sent successfully to corresponding address"
-#~ msgstr "El correu ha estat enviat correctament a la direcció corresponent"
-
-#~ msgid "Servers"
-#~ msgstr "Servidors"
-
-#~ msgid "Verification Information"
-#~ msgstr "Informació de verificació"
-
-#~ msgid "Report name and Resources ids are required!"
-#~ msgstr "Nom d'informe i ids de registres són necessaris!"
diff --git a/addons/smtpclient/i18n/es.po b/addons/smtpclient/i18n/es.po
index d3bee99f6f5..bee10094fe6 100644
--- a/addons/smtpclient/i18n/es.po
+++ b/addons/smtpclient/i18n/es.po
@@ -1,20 +1,20 @@
-# Translation of OpenERP Server.
-# This file containt the translation of the following modules:
-#	* smtpclient
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0-rc1\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-26 06:00+0000\n"
-"PO-Revision-Date: 2010-01-19 05:21+0000\n"
-"Last-Translator: Jordi Esteve - http://www.zikzakmedia.com "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-04-28 15:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-25 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-29 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: smtpclient
@@ -855,16 +855,3 @@ msgstr "res.company.address"
 #: field:email.smtpclient.queue,state:0
 msgid "Message Status"
 msgstr ""
-
-#~ msgid "The Email is sent successfully to corresponding address"
-#~ msgstr ""
-#~ "El correo ha sido enviado correctamente a la dirección correspondiente"
-
-#~ msgid "Servers"
-#~ msgstr "Servidores"
-
-#~ msgid "Verification Information"
-#~ msgstr "Información de verificación"
-
-#~ msgid "Report name and Resources ids are required!"
-#~ msgstr "¡Nombre de informe y ids de registros son necesarios!"
diff --git a/addons/smtpclient/i18n/fr.po b/addons/smtpclient/i18n/fr.po
index 59083df5805..ef3aa9624d6 100644
--- a/addons/smtpclient/i18n/fr.po
+++ b/addons/smtpclient/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-26 06:00+0000\n"
-"PO-Revision-Date: 2010-04-07 13:57+0000\n"
+"PO-Revision-Date: 2010-04-28 15:19+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-13 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-04-29 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: smtpclient
diff --git a/addons/thunderbird/i18n/en_GB.po b/addons/thunderbird/i18n/en_GB.po
new file mode 100644
index 00000000000..5d51db5a9a1
--- /dev/null
+++ b/addons/thunderbird/i18n/en_GB.po
@@ -0,0 +1,86 @@
+# English (United Kingdom) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 06:05+0000\n"
+"PO-Revision-Date: 2010-04-28 19:32+0000\n"
+"Last-Translator: Shay <Unknown>\n"
+"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-29 03:52+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,copy_to:0
+msgid "Copy To"
+msgstr "Copy To"
+
+#. module: thunderbird
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"The Object name must start with x_ and not contain any special characters!"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,description:0
+msgid "Description"
+msgstr "Description"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,reference:0
+msgid "Reference"
+msgstr "Reference"
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_tinythunderbird_partner
+msgid "Thunderbid mails"
+msgstr "Thunderbid mails"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,attachments:0
+msgid "Attached Files"
+msgstr "Attached Files"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,res_user_id:0
+msgid "User"
+msgstr "User"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,receiver:0
+msgid "Receiver"
+msgstr "Receiver"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,date:0
+msgid "Date"
+msgstr "Date"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,title:0
+msgid "Subject"
+msgstr "Subject"
+
+#. module: thunderbird
+#: code:addons/thunderbird/partner/partner.py:0
+#, python-format
+msgid "Archive"
+msgstr "Archive"
+
+#. module: thunderbird
+#: model:ir.module.module,shortdesc:thunderbird.module_meta_information
+msgid "Thunderbird Interface"
+msgstr "Thunderbird Interface"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,sender:0
+msgid "Sender"
+msgstr "Sender"
diff --git a/addons/thunderbird/i18n/es.po b/addons/thunderbird/i18n/es.po
new file mode 100644
index 00000000000..fa718bb8456
--- /dev/null
+++ b/addons/thunderbird/i18n/es.po
@@ -0,0 +1,86 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 06:05+0000\n"
+"PO-Revision-Date: 2010-04-28 19:31+0000\n"
+"Last-Translator: Shay <Unknown>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-29 03:52+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,copy_to:0
+msgid "Copy To"
+msgstr "Copiar a"
+
+#. module: thunderbird
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El objeto debe empezar con  x_ y no puede contener ningún carácter especial!"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,reference:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_tinythunderbird_partner
+msgid "Thunderbid mails"
+msgstr "Correo Thunderbid"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,attachments:0
+msgid "Attached Files"
+msgstr "Archivos Adjuntos"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,res_user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,receiver:0
+msgid "Receiver"
+msgstr "Destinatario"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,title:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: thunderbird
+#: code:addons/thunderbird/partner/partner.py:0
+#, python-format
+msgid "Archive"
+msgstr "Archivar"
+
+#. module: thunderbird
+#: model:ir.module.module,shortdesc:thunderbird.module_meta_information
+msgid "Thunderbird Interface"
+msgstr "Interfaz Thunderbird"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,sender:0
+msgid "Sender"
+msgstr "Remitente"
diff --git a/addons/thunderbird/i18n/zh_CN.po b/addons/thunderbird/i18n/zh_CN.po
new file mode 100644
index 00000000000..265639d5f98
--- /dev/null
+++ b/addons/thunderbird/i18n/zh_CN.po
@@ -0,0 +1,85 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 06:05+0000\n"
+"PO-Revision-Date: 2010-04-28 19:35+0000\n"
+"Last-Translator: Shay <Unknown>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-29 03:52+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,copy_to:0
+msgid "Copy To"
+msgstr "复制到"
+
+#. module: thunderbird
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr "对象名必须是以x_开头并且不能含有特殊字符"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,description:0
+msgid "Description"
+msgstr "描述"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,reference:0
+msgid "Reference"
+msgstr "参考"
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_tinythunderbird_partner
+msgid "Thunderbid mails"
+msgstr "Thunderbid邮件"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,attachments:0
+msgid "Attached Files"
+msgstr "添加附件"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,res_user_id:0
+msgid "User"
+msgstr "用户"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,receiver:0
+msgid "Receiver"
+msgstr "收件人"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,title:0
+msgid "Subject"
+msgstr "主题"
+
+#. module: thunderbird
+#: code:addons/thunderbird/partner/partner.py:0
+#, python-format
+msgid "Archive"
+msgstr "存档"
+
+#. module: thunderbird
+#: model:ir.module.module,shortdesc:thunderbird.module_meta_information
+msgid "Thunderbird Interface"
+msgstr "Thunderbird接口"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,sender:0
+msgid "Sender"
+msgstr "发件人"