diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 9012b930641..0b918d9874c 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -917,7 +917,7 @@ class account_move_line(osv.osv):
 
         if lines and lines[0]:
             partner_id = lines[0].partner_id and lines[0].partner_id.id or False
-            if not partner_obj.has_something_to_reconcile(cr, uid, partner_id, context=context):
+            if partner_id and not partner_obj.has_something_to_reconcile(cr, uid, partner_id, context=context):
                 partner_obj.mark_as_reconciled(cr, uid, [partner_id], context=context)
         return r_id
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1c7c268e905..4ef50a3a62d 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -306,7 +306,7 @@
            <field name="name">Unrealized Gain or Loss</field>
             <field name="model">account.account</field>
             <field name="arch" type="xml">
-                <tree string="Unrealized Gains and losses">
+                <tree string="Unrealized Gains and losses" create="false">
                     <field name="code"/>
                     <field name="name"/>
                     <field name="parent_id" invisible="1"/>
@@ -2159,7 +2159,8 @@
                         <field name="visible" />
                         <field name="complete_tax_set" />
                     </group>
-                    <field name="tax_template_ids" colspan="4" readonly="1" nolabel="1"/>
+                    <separator string="Default Taxes" colspan="4"/>
+                    <field name="tax_template_ids" colspan="4"  nolabel="1"/>
                     <separator string="Properties" colspan="4"/>
                     <group col="4">
                         <field name="property_account_receivable" domain="[('id', 'child_of', [account_root_id])]"/>
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 4bee2002ffd..d17f8c18eee 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -6,7 +6,7 @@
             <field name="name">account.fiscal.position.form</field>
             <field name="model">account.fiscal.position</field>
             <field name="arch" type="xml">
-                <form string="Fiscal Position">
+                <form string="Fiscal Position" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="active"/>
@@ -114,7 +114,7 @@
             context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
             src_model="res.partner"
             view_type="form"
-            view_mode="tree,form,calendar"/>
+            view_mode="tree,form"/>
 
     </data>
 </openerp>
diff --git a/addons/account_check_writing/i18n/es.po b/addons/account_check_writing/i18n/es.po
index 81932642524..c473e077210 100644
--- a/addons/account_check_writing/i18n/es.po
+++ b/addons/account_check_writing/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-09 19:28+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-09 12:09+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-10-30 05:36+0000\n"
-"X-Generator: Launchpad (build 16206)\n"
+"X-Launchpad-Export-Date: 2012-11-10 04:59+0000\n"
+"X-Generator: Launchpad (build 16251)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -154,7 +154,7 @@ msgstr "Compañías"
 #. module: account_check_writing
 #: view:res.company:0
 msgid "Default Check Layout"
-msgstr ""
+msgstr "Comprobar formato por defecto"
 
 #. module: account_check_writing
 #: constraint:account.journal:0
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 881a5e38f1c..5eb98162d5f 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -54,6 +54,8 @@
                 <form string="Bill Payment" version="7.0">
                     <group col="6">
                         <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Supplier" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1, 'invoice_currency': currency_id}"/>
+                        <field name="state" invisible="1"/>
+                        <field name="company_id" invisible="1"/>
                         <field name="amount" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 78c7e103946..1c9a095d6ed 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -98,6 +98,10 @@ class account_analytic_account(osv.osv):
 
     def name_get(self, cr, uid, ids, context=None):
         res = []
+        if not ids:
+            return res
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         for id in ids:
             elmt = self.browse(cr, uid, id, context=context)
             res.append((id, self._get_one_full_name(elmt)))
diff --git a/addons/base_action_rule/i18n/es.po b/addons/base_action_rule/i18n/es.po
index ae917d28ca1..5efae77d99b 100644
--- a/addons/base_action_rule/i18n/es.po
+++ b/addons/base_action_rule/i18n/es.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:24+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2012-11-09 12:09+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-10-30 05:32+0000\n"
-"X-Generator: Launchpad (build 16206)\n"
+"X-Launchpad-Export-Date: 2012-11-10 04:59+0000\n"
+"X-Generator: Launchpad (build 16251)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -340,7 +339,7 @@ msgstr "Activo"
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
 msgid "No Email ID Found for your Company address!"
-msgstr ""
+msgstr "¡No se ha encontrado Id del e-mail para la dirección de su compañía!"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index fe2f139f682..a72a6ec2305 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-10 17:48+0000\n"
-"Last-Translator: Carlos Ch. <Unknown>\n"
+"PO-Revision-Date: 2012-11-09 12:10+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
-"X-Generator: Launchpad (build 16206)\n"
+"X-Launchpad-Export-Date: 2012-11-10 04:59+0000\n"
+"X-Generator: Launchpad (build 16251)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -172,7 +172,7 @@ msgstr "Mes esperado de cierre"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Assigned Opportunities to"
-msgstr ""
+msgstr "Oportunidades asignadas a"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,partner_id:0 view:crm.lead.report:0
@@ -598,7 +598,7 @@ msgstr "Fecha de fin"
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Schedule/Log a Call"
-msgstr ""
+msgstr "Planificar/Registrar una llamada"
 
 #. module: crm
 #: constraint:base.action.rule:0
@@ -792,7 +792,7 @@ msgstr "Siguiente"
 #. module: crm
 #: field:crm.segmentation,som_interval:0
 msgid "Days per Period"
-msgstr ""
+msgstr "Días por periodo"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -959,7 +959,7 @@ msgstr "Días para abrir"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show Time as"
-msgstr ""
+msgstr "Mostrar hora como"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -1342,7 +1342,7 @@ msgstr "Fecha escritura"
 #. module: crm
 #: view:crm.meeting:0
 msgid "End of Recurrency"
-msgstr ""
+msgstr "Fin de recurrencia"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1392,6 +1392,12 @@ msgid ""
 "       \n"
 "If the call needs to be done then the state is set to 'Not Held'."
 msgstr ""
+"El estado se establece a 'Para hacer' cuando se crea el caso.\n"
+"Si es caso está en marcha, el estado se establece a 'Abierto.\n"
+"Cuando la llamada se termina, el estado se establece en 'Realizada'.         "
+"                         \n"
+"Si la llamada está pendiente de ser realizada, entonces el estado se "
+"establece en 'Pendiente'."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -1449,7 +1455,7 @@ msgstr "Oportunidades por categorías"
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_marketing_department
 msgid "Sales Marketing Department"
-msgstr ""
+msgstr "Departamento de ventas y marketing"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1900,7 +1906,7 @@ msgstr "Responder a"
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select Stages for this Sales Team"
-msgstr ""
+msgstr "Seleccione etapas para este equipo de ventas"
 
 #. module: crm
 #: view:board.board:0
@@ -2015,7 +2021,7 @@ msgstr "Ubicación"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
 msgid "Mass Lead To Opportunity Partner"
-msgstr ""
+msgstr "Transformación masiva de iniciativa a oportunidad"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2777,7 +2783,7 @@ msgstr "e-mail del contacto"
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred by"
-msgstr ""
+msgstr "Referido por"
 
 #. module: crm
 #: view:crm.lead:0 model:ir.model,name:crm.model_crm_add_note
@@ -3541,7 +3547,7 @@ msgstr "Nuevas oportunidades"
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "No E-Mail Found for your Company address!"
-msgstr ""
+msgstr "No se encontró dirección de e-mail para el contacto de su compañía"
 
 #. module: crm
 #: field:crm.lead.report,email:0
@@ -3561,7 +3567,7 @@ msgstr "Oportunidades por usuario y equipo"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Reset to Todo"
-msgstr ""
+msgstr "Cambiar a 'Para hacer'"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
@@ -3643,6 +3649,10 @@ msgid ""
 "partner. From the phone call form, you can trigger a request for another "
 "call, a meeting or an opportunity."
 msgstr ""
+"Esta herramienta permite registrar sus llamadas entrantes sobre la marcha. "
+"Cada llamada que recibe aparecerá en el formulario de la empresa para trazar "
+"cada contacto que tiene con una empresa. Desde el formulario de llamadas, "
+"puede lanzar una petición para otra llamada, una reunión u oportunidad."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3673,6 +3683,10 @@ msgid ""
 "channels that will be maintained at the creation of a document in the "
 "system. Some examples of channels can be: Website, Phone Call, Reseller, etc."
 msgstr ""
+"Controle el origen de sus iniciativas y oportunidades de venta mediante la "
+"creación de canales específicos que se usarán en la creación de documentos "
+"en el sistema. Algunos ejemplos de canales son: Sitio web, llamada "
+"telefónica, distribuidores, ..."
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
@@ -3740,7 +3754,7 @@ msgstr "Año"
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "¡Error! No puede crear miembros asociados recursivamente."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index a2120aef6ab..1f1a4f91046 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -91,7 +91,7 @@
             <field name="res_model">crm.phonecall.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{"search_default_year":1,"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{"search_default_year":1,"search_default_Salesperson":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_report_crm_phonecall_tree"/>
             <field name="search_view_id" ref="view_report_crm_phonecall_filter"/>
             <field name="help">From this report, you can analyse the performance of your sales team, based on their phone calls. You can group or filter the information according to several criteria and drill down the information, by adding more groups in the report.</field>
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index e4d5f5999cb..8308e5420d0 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -105,7 +105,7 @@ class crm_claim(base_stage, osv.osv):
         'email_from': fields.char('Email', size=128, help="Destination email for email gateway."),
         'partner_phone': fields.char('Phone', size=32),
         'stage_id': fields.many2one ('crm.claim.stage', 'Stage',
-                        domain="['|', ('section_ids', '=', section_id), ('case_default', '=', True)]"),
+                        domain="['&',('fold', '=', False),'|', ('section_ids', '=', section_id), ('case_default', '=', True)]"),
         'cause': fields.text('Root Cause'),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=crm.AVAILABLE_STATES, string="Status", readonly=True,
diff --git a/addons/crm_claim/crm_claim_data.xml b/addons/crm_claim/crm_claim_data.xml
index 33bd280c364..ed0558f72e9 100644
--- a/addons/crm_claim/crm_claim_data.xml
+++ b/addons/crm_claim/crm_claim_data.xml
@@ -43,38 +43,32 @@
         -->
         
         <record model="crm.claim.stage" id="stage_claim1">
-            <field name="name">Draft claim</field>
+            <field name="name">New</field>
             <field name="state">draft</field>
             <field name="sequence">26</field>
             <field name="case_default" eval="True"/>
         </record>
         <record model="crm.claim.stage" id="stage_claim5">
-            <field name="name">Actions Defined</field>
+            <field name="name">In Progress</field>
             <field name="state">open</field>
             <field name="sequence">27</field>
             <field name="case_default" eval="True"/>
         </record>
         <record model="crm.claim.stage" id="stage_claim2">
-            <field name="name">Actions Done</field>
+            <field name="name">Settled</field>
             <field name="state">done</field>
             <field name="sequence">28</field>
             <field name="case_default" eval="True"/>
         </record>
         <record model="crm.claim.stage" id="stage_claim3">
-            <field name="name">Refused</field>
-            <field name="state">done</field>
+            <field name="name">Rejected</field>
+            <field name="state">cancel</field>
             <field name="sequence">29</field>
             <field name="case_default" eval="True"/>
             <field name="case_refused" eval="True"/>
             <field name="fold" eval="True"/>
         </record>
-        <record model="crm.claim.stage" id="stage_claim3">
-            <field name="name">Cancelled</field>
-            <field name="state">cancel</field>
-            <field name="sequence">30</field>
-            <field name="case_default" eval="True"/>
-            <field name="fold" eval="True"/>
-        </record>
+        
 
     </data>
 </openerp>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 2b5ca4b1556..aa4243a6838 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -102,16 +102,11 @@
             <field name="arch" type="xml">
                 <form string="Claim" version="7.0">
                 <header>
-                    <button name="case_open" string="Open" type="object" class="oe_highlight"
-                            states="draft,pending" groups="base.group_user"/>
-                    <button name="case_close" string="Done" type="object" class="oe_highlight"
-                            states="open,pending" groups="base.group_user"/>
-                    <button name="case_reset" string="Reset to Draft" type="object" groups="base.group_user"
-                            states="cancel,done"/>
-                    <button name="case_cancel" string="Cancel" type="object"  groups="base.group_user"
+                    <button name="case_close" string="Settle" type="object" class="oe_highlight"
+                            states="draft,open,pending" groups="base.group_user"/>
+                    <button name="case_cancel" string="Reject" type="object"  groups="base.group_user"
                             states="draft,open,pending"/>
-                    <field name="stage_id" widget="statusbar"
-                            on_change="onchange_stage_id(stage_id)"/>
+                    <field name="stage_id" widget="statusbar" clickable="True"/>
                 </header>
                 <sheet string="Claims">
                     <group>
diff --git a/addons/crm_partner_assign/i18n/es.po b/addons/crm_partner_assign/i18n/es.po
index 1f1fb3dee6f..4f6521a6421 100644
--- a/addons/crm_partner_assign/i18n/es.po
+++ b/addons/crm_partner_assign/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-16 17:13+0000\n"
-"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
+"PO-Revision-Date: 2012-11-09 12:10+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\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: 2012-10-30 05:33+0000\n"
-"X-Generator: Launchpad (build 16206)\n"
+"X-Launchpad-Export-Date: 2012-11-10 04:59+0000\n"
+"X-Generator: Launchpad (build 16251)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -25,12 +25,12 @@ msgstr "Enviar a"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype:0
 msgid "Message type"
-msgstr ""
+msgstr "Tipo de mensaje"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Eliminar permanentemente los emails depués de su envío"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -40,7 +40,7 @@ msgstr "Retraso para cerrar"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Destinatarios del mensaje"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
@@ -61,7 +61,7 @@ msgstr "Agrupar por..."
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
-msgstr ""
+msgstr "Plantilla"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -76,12 +76,12 @@ msgstr "Geo localizar"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
-msgstr ""
+msgstr "Versión en texto plano del mensaje"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
-msgstr ""
+msgstr "Cuerpo"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -101,7 +101,7 @@ msgstr "Demora cierre"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "#Partner"
-msgstr ""
+msgstr "Nº empresa"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -137,7 +137,7 @@ msgstr "Más alta"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
-msgstr ""
+msgstr "Contenido del texto"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -148,7 +148,7 @@ msgstr "Día"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "Identificador único del mensaje"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -167,6 +167,8 @@ msgid ""
 "Add here all attachments of the current document you want to include in the "
 "Email."
 msgstr ""
+"Añada aquí todos los datos adjuntos del documento que quiere incluir en el "
+"correo."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -195,17 +197,17 @@ msgstr ""
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text/HTML version of the message"
-msgstr ""
+msgstr "Versión en texto enriquecido / HTML del mensaje"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Auto eliminar"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_bcc:0
 msgid "Blind carbon copy message recipients"
-msgstr ""
+msgstr "Destinatarios de la copia oculta"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_id:0
@@ -254,7 +256,7 @@ msgstr "Sección"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
-msgstr ""
+msgstr "Enviar"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -286,7 +288,7 @@ msgstr "Tipo"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -299,11 +301,13 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Tipo de mensaje, normalmente 'html' o 'plano', utilizado para seleccionar "
+"contenidos en texto plano o en texto enriquecido"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
-msgstr ""
+msgstr "Fecha de asignación"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -318,7 +322,7 @@ msgstr "Fecha creación"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "ID del docuemtno relacionado"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -349,7 +353,7 @@ msgstr "Etapa"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document model"
-msgstr ""
+msgstr "Modelo del documento relacionado"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:192
@@ -392,7 +396,7 @@ msgstr "Cerrar"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,use_template:0
 msgid "Use Template"
-msgstr ""
+msgstr "Usar plantilla"
 
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
@@ -464,12 +468,12 @@ msgstr "nº oportunidades"
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Equipo"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Referred Partner"
-msgstr ""
+msgstr "Empresa referida"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -490,7 +494,7 @@ msgstr "Cerrado"
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
-msgstr ""
+msgstr "Envío masivo a empresa"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -570,7 +574,7 @@ msgstr "Longitud Geo"
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
-msgstr ""
+msgstr "Nº oportunidad"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -600,12 +604,12 @@ msgstr "Empresa a la que este caso ha sido reenviado/asignado."
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text contents"
-msgstr ""
+msgstr "Contenido en texto enriquecido"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -620,18 +624,18 @@ msgstr "res.empresa.nivel"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "Id del mensaje"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "Adjuntos"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "Cc"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -641,7 +645,7 @@ msgstr "Septiembre"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,references:0
 msgid "References"
-msgstr ""
+msgstr "Referencias"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -668,7 +672,7 @@ msgstr "Abierto"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Destinatarios de la copia"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,headers:0
@@ -676,6 +680,8 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Cabeceras completas del mensaje, por ejemplo las cabeceras de sesión SMTP "
+"(normalmente disponibles sólo en mensajes entrantes)"
 
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
@@ -698,11 +704,13 @@ msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
 msgstr ""
+"Remitente del mensaje, proveniente de las preferencias del usuario. Si está "
+"vacío, esto no es correo electrónico, sino un mensaje."
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,nbr:0
 msgid "# of Partner"
-msgstr ""
+msgstr "Nº empresa"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -713,7 +721,7 @@ msgstr "Reenviar a empresa"
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,name:0
 msgid "Partner name"
-msgstr ""
+msgstr "Nombre de la empresa"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -728,7 +736,7 @@ msgstr "Ingreso estimado"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Responder a"
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_assigned_id:0
@@ -748,7 +756,7 @@ msgstr "Oportunidad"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
-msgstr ""
+msgstr "Enviar correo"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
@@ -776,7 +784,7 @@ msgstr "País"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,headers:0
 msgid "Message headers"
-msgstr ""
+msgstr "Cabeceras del mensaje"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -786,7 +794,7 @@ msgstr "Convertir en oportunidad"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_bcc:0
 msgid "Bcc"
-msgstr ""
+msgstr "Cco"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -802,7 +810,7 @@ msgstr "Abril"
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
 #: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
-msgstr ""
+msgstr "Análisis de la relación"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
@@ -817,7 +825,7 @@ msgstr "Pendiente"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
-msgstr ""
+msgstr "Análisis de la empresa asignada"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
@@ -828,11 +836,12 @@ msgstr "Informe de iniciativas CRM"
 #: help:crm.lead.forward.to.partner,references:0
 msgid "Message references, such as identifiers of previous messages"
 msgstr ""
+"Referencias del mensaje, tales como identificadores de mensajes anteriores"
 
 #. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "¡Error! No puede crear miembros asociados recursivamente."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -847,12 +856,12 @@ msgstr "Secuencia"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
-msgstr ""
+msgstr "Informe de la empresa CRM"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Asistente de composición de e-mail"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -873,7 +882,7 @@ msgstr "Fecha de creación"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Filtros"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -884,7 +893,7 @@ msgstr "Año"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "Dirección de correo de respuesta preferida para este mensaje"
 
 #~ msgid "Reply-to of the Sales team defined on this case"
 #~ msgstr "\"Responder a\" del equipo de ventas definido en este caso"
@@ -941,3 +950,6 @@ msgstr ""
 #~ "partners o asesores,\n"
 #~ "basándose en geo-localización.\n"
 #~ "    "
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Asistente de composición de e-mail"
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index d531b00bc43..9b9986a0b01 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -56,7 +56,10 @@ class fleet_vehicle_cost(osv.Model):
     def _year_get_fnc(self, cr, uid, ids, name, unknow_none, context=None):
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
-            res[record.id] = str(time.strptime(record.date, tools.DEFAULT_SERVER_DATE_FORMAT).tm_year)
+            if (record.date):
+                res[record.id] = str(time.strptime(record.date, tools.DEFAULT_SERVER_DATE_FORMAT).tm_year)
+            else:
+                res[record.id] = _('Unknown')
         return res
 
     def _cost_name_get_fnc(self, cr, uid, ids, name, unknow_none, context=None):
@@ -253,7 +256,6 @@ class fleet_vehicle(osv.Model):
 
     def _search_get_overdue_contract_reminder(self, cr, uid, obj, name, args, context):
         res = []
-        today = fields.date.today(self, cr, uid, context=context)
         for field, operator, value in args:
             assert operator in ('=', '!=', '<>') and value in (True, False), 'Operation not supported'
             if (operator == '=' and value == True) or (operator in ('<>', '!=') and value == False):
@@ -343,7 +345,7 @@ class fleet_vehicle(osv.Model):
         'seats': fields.integer('Seats Number', help='Number of seats of the vehicle'),
         'doors': fields.integer('Doors Number', help='Number of doors of the vehicle'),
         'tag_ids' :fields.many2many('fleet.vehicle.tag', 'fleet_vehicle_vehicle_tag_rel', 'vehicle_tag_id','tag_id', 'Tags'),
-        'odometer': fields.function(_get_odometer, fnct_inv=_set_odometer, type='float', string='Odometer Value', help='Odometer measure of the vehicle at the moment of this log'),
+        'odometer': fields.function(_get_odometer, fnct_inv=_set_odometer, type='float', string='Last Odometer', help='Odometer measure of the vehicle at the moment of this log'),
         'odometer_unit': fields.selection([('kilometers', 'Kilometers'),('miles','Miles')], 'Odometer Unit', help='Unit of the odometer ',required=True),
         'transmission': fields.selection([('manual', 'Manual'), ('automatic', 'Automatic')], 'Transmission', help='Transmission Used by the vehicle'),
         'fuel_type': fields.selection([('gasoline', 'Gasoline'), ('diesel', 'Diesel'), ('electric', 'Electric'), ('hybrid', 'Hybrid')], 'Fuel Type', help='Fuel Used by the vehicle'),
@@ -769,8 +771,8 @@ class fleet_vehicle_log_contract(osv.Model):
         'start_date': fields.date('Contract Start Date', help='Date when the coverage of the contract begins'),
         'expiration_date': fields.date('Contract Expiration Date', help='Date when the coverage of the contract expirates (by default, one year after begin date)'),
         'days_left': fields.function(get_days_left, type='integer', string='Warning Date'),
-        'insurer_id' :fields.many2one('res.partner', 'Supplier', domain="[('supplier','=',True)]"),
-        'purchaser_id': fields.many2one('res.partner', 'Contractor', domain="['|', ('customer','=',True), ('employee','=',True)]",help='Person to which the contract is signed for'),
+        'insurer_id' :fields.many2one('res.partner', 'Supplier'),
+        'purchaser_id': fields.many2one('res.partner', 'Contractor', help='Person to which the contract is signed for'),
         'ins_ref': fields.char('Contract Reference', size=64),
         'state': fields.selection([('open', 'In Progress'), ('toclose','To Close'), ('closed', 'Terminated')], 'Status', readonly=True, help='Choose wheter the contract is still valid or not'),
         'notes': fields.text('Terms and Conditions', help='Write here all supplementary informations relative to this contract'),
diff --git a/addons/fleet/fleet_board_view.xml b/addons/fleet/fleet_board_view.xml
index 425d5c5b8eb..760fc1cf583 100644
--- a/addons/fleet/fleet_board_view.xml
+++ b/addons/fleet/fleet_board_view.xml
@@ -43,7 +43,7 @@
       <field name="view_id" ref="fleet_vehicle_kanban"></field>
       <field name="view_type">form</field>
       <field name="view_mode">tree</field>
-      <field name="domain">['|',('contract_renewal_due_soon','>',0),('contract_renewal_overdue','>',0)]</field>
+      <field name="domain">['|',('contract_renewal_due_soon','=',True),('contract_renewal_overdue','=',True)]</field>
       <field name="help" type="html">
         <p>
           Here are displayed vehicles for which one or more contracts need to be renewed. If you see this message, then there is no contracts to renew.
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index bb15440ba37..ecec39f22d8 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -256,7 +256,7 @@
                     <field name="location"/>
                     <field name="state" />
                     <field name="state" />
-                    <filter name="alert_true" domain="['|',('contract_renewal_due_soon','>',0),('contract_renewal_overdue','>',0)]" string="Has Alert(s)"/>
+                    <filter name="alert_true" domain="['|',('contract_renewal_due_soon','=',True),('contract_renewal_overdue','=',True)]" string="Has Alert(s)"/>
                </search>
             </field>
         </record>
diff --git a/addons/hr/i18n/es_EC.po b/addons/hr/i18n/es_EC.po
index 32e81b6d14d..bfbbb7fa180 100644
--- a/addons/hr/i18n/es_EC.po
+++ b/addons/hr/i18n/es_EC.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-01-03 02:55+0000\n"
-"Last-Translator: Christopher Ormaza - (Ecuadorenlinea.net) "
-"<chris.ormaza@gmail.com>\n"
+"PO-Revision-Date: 2012-11-10 17:20+0000\n"
+"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@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: 2012-10-30 05:17+0000\n"
-"X-Generator: Launchpad (build 16206)\n"
+"X-Launchpad-Export-Date: 2012-11-11 04:57+0000\n"
+"X-Generator: Launchpad (build 16251)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -199,6 +198,8 @@ msgstr "Mujer"
 msgid ""
 "Expected number of employees for this job position after new recruitment."
 msgstr ""
+"Número de Empleados para este puesto de trabajo después de las nuevas "
+"contrataciones"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -291,7 +292,7 @@ msgstr "Categorías"
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Total Employees"
-msgstr ""
+msgstr "Total de Empleados"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -435,7 +436,7 @@ msgstr "Estado"
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_tree
 msgid "Categories Structure"
-msgstr ""
+msgstr "Estructura de categorías"
 
 #. module: hr
 #: field:hr.employee,partner_id:0
@@ -465,7 +466,7 @@ msgstr "¡Error! No se puede crear una jerarquía recursiva de empleados."
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Subordinate Hierarchy"
-msgstr ""
+msgstr "Jerarquía subirdinada"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -715,12 +716,12 @@ msgstr "Subordinados"
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "Number of employees currently occupying this job position."
-msgstr ""
+msgstr "Número de empleados ocupando actualmente este puesto de trabajo"
 
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Number of new employees you expect to recruit."
-msgstr ""
+msgstr "Número de empleados que espera contratar"
 
 #~ msgid "Working Time Categories"
 #~ msgstr "Categorías de Horarios de Trabajo"
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index c9961fa8a1d..96a37c0e448 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -236,16 +236,6 @@ class product_product(osv.osv):
         'hr_expense_ok': fields.boolean('Can be Expensed', help="Specify if the product can be selected in an HR expense line."),
     }
 
-    def on_change_hr_expense_ok(self, cr, uid, id, hr_expense_ok):
-
-        if not hr_expense_ok:
-            return {}
-        data_obj = self.pool.get('ir.model.data')
-        cat_id = data_obj._get_id(cr, uid, 'hr_expense', 'cat_expense')
-        categ_id = data_obj.browse(cr, uid, cat_id).res_id
-        res = {'value' : {'type':'service','sale_ok' :False,'categ_id':categ_id }}
-        return res
-
 product_product()
 
 class hr_expense_line(osv.osv):
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 74b77009aae..d4b7cbae1ce 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -195,7 +195,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <div name="options" position="inside">
-                    <field name="hr_expense_ok" on_change="on_change_hr_expense_ok(hr_expense_ok)"/>
+                    <field name="hr_expense_ok"/>
                     <label for="hr_expense_ok"/>
                 </div>
             </field>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 419b1bb8335..92b1d57ce15 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -90,6 +90,18 @@ class hr_holidays_status(osv.osv):
         'color_name': 'red',
         'active': True,
     }
+
+    def name_get(self, cr, uid, ids, context=None):
+        if not ids:
+            return []
+        res = []
+        for record in self.browse(cr, uid, ids, context=context):
+            name = record.name
+            if not record.limit:
+                name = name + ('  (%d/%d)' % (record.leaves_taken or 0.0, record.max_leaves or 0.0))
+            res.append((record.id, name))
+        return res
+
 hr_holidays_status()
 
 class hr_holidays(osv.osv):
diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index bda93fc485d..2ab391a3f02 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -2,6 +2,11 @@
 <openerp>
     <data noupdate="1">
 
+        <!-- Update demo user to avoid mail bombing -->
+        <record id="base.partner_demo" model="res.partner">
+            <field name="notification_email_send">none</field>
+        </record>
+
         <record id="message_blogpost0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py
index c1712b81a26..ec3deb524a3 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -28,10 +28,6 @@ class mrp_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_stock_planning': fields.boolean('Manage master production shedule',
-            help ="""This allows to create a manual procurement plan apart of the normal MRP scheduling,
-                which works automatically based on minimum stock rules.
-                This installs the module stock_planning."""),
         'module_mrp_repair': fields.boolean("Manage repairs of products ",
             help="""Allows to manage all product repairs.
                     * Add/remove products in the reparation
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 6b4058fb7b4..2c7047380a8 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -56,10 +56,6 @@
                                 <field name="module_mrp_operations" class="oe_inline"/>
                                 <label for="module_mrp_operations" />
                             </div>
-                            <div>
-                                <field name="module_stock_planning" class="oe_inline"/>
-                                <label for="module_stock_planning"/>
-                            </div>
                         </div>
                     </group>
                     <separator string="Master Data"/>
diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css
index 1b7e9315e74..16d71e28aa5 100644
--- a/addons/note/static/src/css/note.css
+++ b/addons/note/static/src/css/note.css
@@ -49,8 +49,8 @@
   padding: 8px;
   margin-left: 3px;
   margin-right: 3px;
-  padding-bottom: 16px;
-  margin-bottom: 16px;
+  padding-bottom: 8px;
+  margin-bottom: 10px;
   -webkit-transform: rotate(-2deg);
   -o-transform: rotate(-2deg);
   -moz-transform: rotate(-2deg);
diff --git a/addons/note/static/src/css/note.sass b/addons/note/static/src/css/note.sass
index b5bc28a2593..6f0c0883ae7 100644
--- a/addons/note/static/src/css/note.sass
+++ b/addons/note/static/src/css/note.sass
@@ -53,8 +53,8 @@
       padding: 8px
       margin-left: 3px
       margin-right: 3px
-      padding-bottom: 16px
-      margin-bottom: 16px
+      padding-bottom: 8px
+      margin-bottom: 10px
       @include rotate(-2deg)
       @include transition(all, 300ms)
   .oe_kanban_record:nth-of-type(even)
diff --git a/addons/pad/pad.py b/addons/pad/pad.py
index e5b36e5f64c..932fc5a21a4 100644
--- a/addons/pad/pad.py
+++ b/addons/pad/pad.py
@@ -19,7 +19,7 @@ class pad_common(osv.osv_memory):
 
         pad = {
             "server" : company.pad_server,
-            "key" : company.pad_key or "4DxmsNIbnQUVQMW9S9tx2oLOSjFdrx1l",
+            "key" : company.pad_key,
         }
 
         # make sure pad server in the form of http://hostname
diff --git a/addons/pad/pad_demo.xml b/addons/pad/pad_demo.xml
index 407f90e8242..99c4b38481c 100644
--- a/addons/pad/pad_demo.xml
+++ b/addons/pad/pad_demo.xml
@@ -1,9 +1,13 @@
 <openerp>
-  <data noupdate="1">
+  <data>
 
     <record id="base.main_company" model="res.company">
       <field name="pad_server">pad.openerp.com</field>
     </record>
+    
+    <record id="base.main_company" model="res.company">
+      <field name="pad_key">4DxmsNIbnQUVQMW9S9tx2oLOSjFdrx1l</field>
+    </record>
 
   </data>
 </openerp>
diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index 7c6b2a639c1..929d62681c8 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -14,6 +14,7 @@ openerp.pad = function(instance) {
                         object_id: self.view.datarecord.id
                     }}).done(function(data) {
                     if(data&&data.url){
+                        self.set({value: data.url});
                         _super(data.url);
                         self.renderElement();
                     }
diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index c823350cdfd..0b8ab70a9c0 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -941,8 +941,10 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             var self = this;
             var x = new module.PaymentlineWidget(null, {
                     payment_line: newPaymentLine
-                });
-            x.on('delete_payment_line', self, self.deleteLine);
+            });
+            x.on('delete_payment_line', self, function(r) {
+                self.deleteLine(r);
+            });
             x.appendTo(this.$('#paymentlines'));
         },
         renderElement: function() {
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index fe86c9dc163..c7874a4bd5c 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -315,7 +315,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this._super();
             this.$('input').keyup(_.bind(this.changeAmount, this));
             this.$('.delete-payment-line').click(function() {
-                self.trigger('delete_payment_line');
+                self.trigger('delete_payment_line', self);
             });
         },
     });
@@ -1051,7 +1051,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this.pos.barcode_reader.disconnect();
             return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_client_pos_menu']], ['res_id']).pipe(
                     _.bind(function(res) {
-                return this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(action) {
+                return this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(result) {
+                    var action = result;
                     action.context = _.extend(action.context || {}, {'cancel_action': {type: 'ir.actions.client', tag: 'reload'}});
                     //self.destroy();
                     this.do_action(action);
diff --git a/addons/project/project.py b/addons/project/project.py
index 741cae4b91b..df422f4cc8f 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -204,8 +204,8 @@ class project(osv.osv):
     def attachment_tree_view(self, cr, uid, ids, context):
         task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)])
         domain = [
-            ('|', 
-             '&', 'res_model', '=', 'project.project'), ('res_id', 'in', ids),
+             '|', 
+             '&', ('res_model', '=', 'project.project'), ('res_id', 'in', ids),
              '&', ('res_model', '=', 'project.task'), ('res_id', 'in', task_ids)
 		]
         res_id = ids and ids[0] or False
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 58f0ae17962..e7f12ff3797 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -164,7 +164,7 @@
             <field name="model">project.project</field>
             <field name="arch" type="xml">
                 <search string="Search Project">
-                    <field name="complete_name" string="Project Name"/>
+                    <field name="name" string="Project Name"/>
                     <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 7d17364f369..200be4a593a 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -293,6 +293,27 @@ class purchase_order(osv.osv):
         fiscal_position = supplier.property_account_position and supplier.property_account_position.id or False
         return {'value':{'pricelist_id': pricelist, 'fiscal_position': fiscal_position}}
 
+    def invoice_open(self, cr, uid, ids, context=None):
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+
+        result = mod_obj.get_object_reference(cr, uid, 'account', 'action_invoice_tree2')
+        id = result and result[1] or False
+        result = act_obj.read(cr, uid, [id], context=context)[0]
+        inv_ids = []
+        for po in self.browse(cr, uid, ids, context=context):
+            inv_ids+= [invoice.id for invoice in po.invoice_ids]
+        if not inv_ids:
+            raise osv.except_osv(_('Error!'), _('Please create Invoices.'))
+         #choose the view_mode accordingly
+        if len(inv_ids)>1:
+            result['domain'] = "[('id','in',["+','.join(map(str, inv_ids))+"])]"
+        else:
+            res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_supplier_form')
+            result['views'] = [(res and res[1] or False, 'form')]
+            result['res_id'] = inv_ids and inv_ids[0] or False
+        return result
+
     def view_invoice(self, cr, uid, ids, context=None):
         '''
         This function returns an action that display existing invoices of given sale order ids. It can either be a in a list or in a form view, if there is only one invoice to show.
@@ -547,7 +568,6 @@ class purchase_order(osv.osv):
             'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none',
             'type': 'in',
             'partner_id': order.dest_address_id.id or order.partner_id.id,
-            'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none',
             'purchase_id': order.id,
             'company_id': order.company_id.id,
             'move_lines' : [],
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index cff258e3017..db71a969fbe 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -282,8 +282,6 @@
                                     <field name="date_approve" groups="base.group_no_one"/>
                                 </group>
                             </group>
-                            <separator string="Invoices"/>
-                            <field name="invoice_ids" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>
                         </page>
                     </notebook>
                 </sheet>
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 9e5aa2e074e..188baeccd69 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -48,6 +48,8 @@
                         <button type="object"
                             name="view_picking"
                             string="Incoming Shipments" states="approved"/>
+                        <button type="object"  name="invoice_open"
+                            string="Invoices" attrs="{'invisible': [('state', '=', 'draft')]}"/> 
                     </div>
                 </xpath>
             </field>
diff --git a/addons/stock/stock_sequence.xml b/addons/stock/stock_sequence.xml
index 6c0b3e84cf2..c3569c48c3e 100644
--- a/addons/stock/stock_sequence.xml
+++ b/addons/stock/stock_sequence.xml
@@ -17,7 +17,7 @@
         
         <record id="seq_type_picking_internal" model="ir.sequence.type">
             <field name="name">Picking INT</field>
-            <field name="code">stock.picking.internal</field>
+            <field name="code">stock.picking</field>
         </record>
 
         <!--
@@ -42,7 +42,7 @@
         
         <record id="seq_picking_internal" model="ir.sequence">
             <field name="name">Picking INT</field>
-            <field name="code">stock.picking.internal</field>
+            <field name="code">stock.picking</field>
             <field name="prefix">INT/</field>
             <field name="padding">5</field>
             <field name="company_id" eval="False"/>