diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index f0cec0abda3..9cb72780ff1 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -155,7 +155,7 @@
                         <field name="currency_id" width="50"/>
                         <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                         <newline/>
-                        <field string="Supplier" name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
+                        <field string="Supplier" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"/>
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                         <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                         <newline/>
@@ -264,7 +264,7 @@
                     <field name="currency_id" width="50"/>
                     <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                     <newline/>
-                    <field string="Customer" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user"/>
+                    <field string="Customer" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user" context="{'search_default_customer': 1}"/>
                     <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                     <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                     <newline/>
@@ -461,7 +461,7 @@
             <field name="domain">[('type','=','in_invoice')]</field>
             <field name="context">{'type':'in_invoice', 'journal_type': 'purchase'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">With Supplier Invoices you can enter and manage invoices issued by your suppliers. OpenERP can also generate draft invoices automatically from purchase order or receipt. This way, you can control the invoice from your supplier according to what you purchased or received.</field>
+            <field name="help">With Supplier Invoices you can enter and manage invoices issued by your suppliers. OpenERP can also generate draft invoices automatically from purchase orders or receipts. This way, you can control the invoice from your supplier according to what you purchased or received.</field>
         </record>
         <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
 
diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml
index d3da592e085..15614444822 100644
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@@ -479,7 +479,7 @@
             <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]</para>
+            <para style="terp_default_Bold_9_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.symbol or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -616,4 +616,4 @@
     </section>
     </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 2d2fbed9ef9..22712af0f8c 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -508,7 +508,7 @@
             <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_7_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]</para>
+            <para style="terp_default_Bold_7_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.symbol or '' ]]</para>
           </td>
         </tr>
       </blockTable>
diff --git a/addons/account/report/account_partner_balance.py b/addons/account/report/account_partner_balance.py
index ab3cfd70970..eacafb02eda 100644
--- a/addons/account/report/account_partner_balance.py
+++ b/addons/account/report/account_partner_balance.py
@@ -28,8 +28,6 @@ from common_report_header import common_report_header
 class partner_balance(report_sxw.rml_parse, common_report_header):
 
     def __init__(self, cr, uid, name, context=None):
-        if context is None:
-            context = {}
         super(partner_balance, self).__init__(cr, uid, name, context=context)
         self.account_ids = []
         self.localcontext.update( {
@@ -276,6 +274,7 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
         return temp_res
 
     def _sum_litige(self):
+        #gives the total of move lines with blocked boolean set to TRUE for the report selection
         move_state = ['draft','posted']
         if self.target_move == 'posted':
             move_state = ['posted']
@@ -296,12 +295,15 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
         return temp_res
 
     def _get_partners(self):
+        cr, uid = self.cr, self.uid
+        context = self.localcontext # all of it?
+
         if self.result_selection == 'customer':
-            return 'Receivable Accounts'
+            return _('Receivable Accounts')
         elif self.result_selection == 'supplier':
-            return 'Payable Accounts'
+            return _('Payable Accounts')
         elif self.result_selection == 'customer_supplier':
-            return 'Receivable and Payable Accounts'
+            return _('Receivable and Payable Accounts')
         return ''
 
 report_sxw.report_sxw('report.account.partner.balance', 'res.partner', 'account/report/account_partner_balance.rml',parser=partner_balance, header="internal")
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 9c3034fe127..01c34459289 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -384,7 +384,7 @@ class account_analytic_account(osv.osv):
         'ca_to_invoice': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Uninvoiced Amount',
             help="If invoice from analytic account, the remaining amount you can invoice to the customer based on the total costs.",
             digits_compute=dp.get_precision('Account')),
-        'ca_theorical': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Theorical Revenue',
+        'ca_theorical': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Theoretical Revenue',
             help="Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist.",
             digits_compute=dp.get_precision('Account')),
         'hours_quantity': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Hours Tot',
@@ -410,7 +410,7 @@ class account_analytic_account(osv.osv):
         'real_margin': fields.function(_real_margin_calc, method=True, type='float', string='Real Margin',
             help="Computed using the formula: Invoiced Amount - Total Costs.",
             digits_compute=dp.get_precision('Account')),
-        'theorical_margin': fields.function(_theorical_margin_calc, method=True, type='float', string='Theorical Margin',
+        'theorical_margin': fields.function(_theorical_margin_calc, method=True, type='float', string='Theoretical Margin',
             help="Computed using the formula: Theorial Revenue - Total Costs",
             digits_compute=dp.get_precision('Account')),
         'real_margin_rate': fields.function(_real_margin_rate_calc, method=True, type='float', string='Real Margin Rate (%)',
diff --git a/addons/account_invoice_layout/account_invoice_layout_demo.xml b/addons/account_invoice_layout/account_invoice_layout_demo.xml
index e49079c9656..96f285caabf 100644
--- a/addons/account_invoice_layout/account_invoice_layout_demo.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_demo.xml
@@ -4,11 +4,7 @@
 
         <record id="demo_message1" model="notify.message">
             <field name="name">OpenERP SA</field>
-            <field name="msg">ERP &amp; CRM Solutions....</field>
-        </record>
-        <record id="demo_message1" model="notify.message">
-            <field name="name">Tiny sprl</field>
-            <field name="msg">Be Expert with the Experts...</field>
+            <field name="msg">ERP &amp; CRM Solutions...</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 481fef477e1..ba5264d759b 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -776,7 +776,7 @@ class account_voucher(osv.osv):
                     'date': inv.date,
                     'credit': diff > 0 and diff or 0.0,
                     'debit': diff < 0 and -diff or 0.0,
-		    'amount_currency': company_currency <> current_currency and currency_pool.compute(cr, uid, company_currency, current_currency, diff * -1, context=context_multi_currency) or 0.0,
+                    'amount_currency': company_currency <> current_currency and currency_pool.compute(cr, uid, company_currency, current_currency, diff * -1, context=context_multi_currency) or 0.0,
                     'currency_id': company_currency <> current_currency and current_currency or False,
                 }
 
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 3367b08583b..918099487ab 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -167,7 +167,7 @@
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                         <group attrs="{'invisible':[('state','!=','posted')]}">
-                           <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now')]}"/>
+                           <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
                         </group>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                     </group>
@@ -286,7 +286,7 @@
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <group attrs="{'invisible':[('state','!=','posted')]}">
-                            <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':[('pay_now','!=','pay_now')]}"/>
+                            <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
                         </group>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 1229a63f860..6f6b461d1a6 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -82,7 +82,7 @@
             <field name="search_view_id" ref="view_audittrail_rule_search"/>
         </record>
 
-        <menuitem name="Rules" id="menu_action_audittrail_rule_tree"
+        <menuitem id="menu_action_audittrail_rule_tree"
             action="action_audittrail_rule_tree" parent="base.menu_audit" />
         <!-- AuditTrail Log form -->
 
diff --git a/addons/board/security/ir.model.access.csv b/addons/board/security/ir.model.access.csv
index 0110e1678ae..1b0abd337c7 100644
--- a/addons/board/security/ir.model.access.csv
+++ b/addons/board/security/ir.model.access.csv
@@ -4,4 +4,5 @@
 "access_board_note_type","board.note.type","model_board_note_type","base.group_user",1,1,1,1
 "access_board_note","board.note","model_board_note","base.group_user",1,1,1,1
 "access_board_board_sale_salesman","board.board.sale.salesman","model_board_board","base.group_sale_salesman",1,1,1,1
-
+"access_res_log_report_system","res.log.report system","model_res_log_report",base.group_system,1,0,0,0
+"access_res_log_report_erp_manager","res.log.report erp_manager","model_res_log_report",base.group_erp_manager,1,0,0,0
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 6c66dc94848..7a60af9533b 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -60,7 +60,7 @@
             <form string="Phone Call">
                  <group colspan="6" col="7">
                     <field name="name" required="1"/>
-                    <field name="partner_phone" required="1"/>
+                    <field name="partner_phone"/>
                     <field name="duration" widget="float_time" required="1"/>
                     <button string="Schedule a Meeting" name="action_make_meeting" icon="gtk-redo" type="object"/>
 
diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml
index 3c4a988cc79..353a8c95432 100644
--- a/addons/crm/test/test_crm_lead.yml
+++ b/addons/crm/test/test_crm_lead.yml
@@ -1,12 +1,12 @@
 -  |
-   In order to test the CRM in OpenERP, 
+   In order to test the CRM in OpenERP,
    I will do a customer qualification process that
    starts with a fist contact with a customer (a lead), which will be converted to a
    business opportunity and a partner.
 -  |
    In order to test the flow, I create a two new users "user_crm" and
    I assign the group "salesman".
-- 
+-
    !record {model: res.users, id: res_users_usercrm0}:
      company_id: base.main_company
      context_lang: en_US
@@ -16,11 +16,11 @@
      login: user_crm
      name: user_crm
      password: user_crm
-  
+
 -  |
    I start by creating a new lead "New Customer" and I provide an address to this
    new customer, as well as an email "info@mycustomer.com".
-- 
+-
    !record {model: crm.lead, id: crm_lead_newcustomer0}:
      email_from: info@mycustomer.com
      name: New Customer
@@ -30,26 +30,26 @@
      section_id: crm.section_sales_department
      referred: False
 -  |
-   I check that the lead is in 'draft' state, 
--    
+   I check that the lead is in 'draft' state,
+-
    !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in Draft}:
      - state == "draft"
 -
    I open lead by click on "Open" button,
--   
+-
    !python {model: crm.lead}: |
      self.case_open(cr, uid, [ref("crm_lead_newcustomer0")])
 - |
   I check that lead is now in 'open' state.
 -
   !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in open state}:
-     - state == "open"  
-       
+     - state == "open"
+
 -  |
    As the lead seems to be a real business opportunity, I will convert it to a
-   partner 
+   partner
    and a business opportunity by clicking on the "Convert" button.
--  
+-
    !python {model: crm.lead}: |
      lead = self.browse(cr, uid, ref('crm_lead_newcustomer0'))
      action = self.convert_opportunity(cr, uid, [ref("crm_lead_newcustomer0")], {'active_ids': [ref("crm_lead_newcustomer0")]})
@@ -66,21 +66,21 @@
    !python {model: crm.lead2opportunity.partner}: |
       self.make_partner(cr, uid, [ref("crm_lead2opportunity_partner_create_0")], {'active_ids': [ref("crm_lead_newcustomer0")]})
 -
-  Now, I give value to this wizard field.     
+  Now, I give value to this wizard field.
 -
-  !record {model: crm.lead2opportunity, id: crm_lead2opportunity_stonage_0}: 
+  !record {model: crm.lead2opportunity, id: crm_lead2opportunity_stonage_0}:
       name:  Capegemini
       planned_revenue: 0.00
       probability: 0.00
 -
   Then, Click on "Create Opportunity" button of this wizard.
--      
+-
   !python {model: crm.lead2opportunity}: |
      self.action_apply(cr, uid, [ref('crm_lead2opportunity_stonage_0')], {'active_id': ref('crm_lead_newcustomer0')})
 
 -  |
    In order to check the opportunity is created or not, I check type.
--  
+-
   !python {model: crm.lead}: |
     lead = self.browse(cr, uid, ref("crm_lead_newcustomer0"))
     assert lead.type == 'opportunity'
diff --git a/addons/crm/test/test_crm_opportunity.yml b/addons/crm/test/test_crm_opportunity.yml
index 99e81afc828..1392402965a 100644
--- a/addons/crm/test/test_crm_opportunity.yml
+++ b/addons/crm/test/test_crm_opportunity.yml
@@ -11,13 +11,13 @@
     stage_id: crm.stage_opportunity1
     categ_id: crm.categ_oppor2
     section_id: crm.section_sales_department
-    
+
 -  |
    I check that the opportunity is in 'New' state.
 -
    !assert {model: crm.lead, id: crm_opportunity_abcfuelcounits0}:
      - state == "draft"
--  |  
+-  |
    I open opportunity by click on "Open" button,
 -
    !python {model: crm.lead}: |
@@ -29,7 +29,7 @@
 -
    !python {model: crm.lead}: |
     self.action_makeMeeting(cr, uid, [ref("crm_opportunity_abcfuelcounits0")])
-    
+
 -  |
    I can see that Meeting's calendar view is shown.
    then I click on the date on which I want to schedule meeting.
@@ -49,26 +49,27 @@
 - |
   In order to schedule a phonecall to the partner
   I click on "schedule call" button and select planned date for the call.
-- 
+-
   !record {model: crm.opportunity2phonecall, id: crm_opportunity2phonecall_abcfuelcounits0}:
     date: '2010-04-17 11:15:00'
     name: 'ABC FUEL CO 829264 - 10002 units'
     section_id: crm.section_sales_department
     user_id: base.user_demo
-- |    
-  schedule phonecall by apply (action_apply)function of opportunity2phoncall wizard  
--    
+    categ_id: crm.categ_phone1
+- |
+  schedule phonecall by apply (action_apply)function of opportunity2phoncall wizard
+-
   !python {model: crm.opportunity2phonecall}: |
       self.action_apply(cr, uid, [ref('crm_opportunity2phonecall_abcfuelcounits0')], {'active_ids': [ref("crm_opportunity_abcfuelcounits0")]})
 - |
-  I  check that phonecall record is created for that opportunity.       
--   
+  I  check that phonecall record is created for that opportunity.
+-
   !python {model: crm.phonecall}: |
     phone_obj = self.pool.get('crm.phonecall')
     ids = phone_obj.search(cr, uid, [('name', '=', 'ABC FUEL CO 829264 - 10002 units')])
     assert len(ids)
-- |    
-  I can see phonecall record after click on "Schedule call" wizard.     
+- |
+  I can see phonecall record after click on "Schedule call" wizard.
 -
   !record {model: crm.phonecall, id: crm_phonecall_abcfuelcounits0}:
     date: '2010-04-17 11:15:00'
@@ -77,4 +78,4 @@
     partner_address_id:  base.res_partner_address_1
     partner_id:  base.res_partner_9
     section_id: crm.section_sales_department
-    
+
diff --git a/addons/crm/test/test_crm_phonecall.yml b/addons/crm/test/test_crm_phonecall.yml
index 1351ba88199..5c12da99a7d 100644
--- a/addons/crm/test/test_crm_phonecall.yml
+++ b/addons/crm/test/test_crm_phonecall.yml
@@ -1,36 +1,35 @@
 - |
   I start by creating a new phonecall.
-- 
+-
   !record {model: crm.phonecall, id: crm_phonecall_interviewcall0}:
     date: '2010-04-21 18:59:00'
     name: Interview call
     section_id: crm.section_sales_department
-- |
+-
   Now , I select partner by click on "Create a Partner" button.
-  	 
-- 
+-
   !record {model: crm.phonecall2partner, id: crm_phonecall2partner_1}:
     action: exist
     partner_id: base.res_partner_9
 
-- 
+-
   Now, click on "Continue" button of this wizard.
-- 
+-
   !python {model: crm.phonecall2partner}: |
-    self.make_partner(cr, uid, [ref("crm_phonecall2partner_1")], {"active_ids": [ref("crm_phonecall_interviewcall0")]})    
-    
+    self.make_partner(cr, uid, [ref("crm_phonecall2partner_1")], {"active_ids": [ref("crm_phonecall_interviewcall0")]})
+
 - |
   As the success of phonecall seems to be a real business opportunity, I will convert
   it to opportunity by clicking on the "Convert to Opportunity" button.
-- 
+-
   !record {model: crm.phonecall2opportunity, id: crm_phonecall2opportunity_interviewcall0}:
     name: Interview call
     partner_id: base.res_partner_9
     planned_revenue: 0.0
-    probability: 0.0  
+    probability: 0.0
+-
+   Now, I click on "Convert" button of this wizard.
 -
-   Now, I click on "Convert" button of this wizard.    
--    
   !python {model: crm.phonecall2opportunity}: |
      self.action_apply(cr, uid, [ref("crm_phonecall2opportunity_interviewcall0")], {"active_id": ref("crm_phonecall_interviewcall0")})
 
@@ -39,29 +38,29 @@
 -
   !assert {model: crm.phonecall, id: crm_phonecall_interviewcall0}:
      - opportunity_id != False
-      
+
 - |
   And I check that the phonecall and the newly created business opportunity is linked
   to same  partner
 -
-  !python {model:  crm.phonecall}: | 
+  !python {model:  crm.phonecall}: |
     obj_phonecall = self.browse(cr, uid, ref('crm_phonecall_interviewcall0'))
     ids = self.pool.get('crm.lead').search(cr, uid, [('name', '=', obj_phonecall.opportunity_id.name)])
     obj_opp = self.pool.get('crm.lead').browse(cr, uid, ids)[0]
     assert obj_phonecall.partner_id == obj_opp.partner_id
-  
+
 - |
   I schedule Meeting on this current phonecall by clicking on "schedule
   Meeting"
 -
    !python {model: crm.phonecall}: |
      self.action_make_meeting(cr, uid, [ref('crm_phonecall_interviewcall0')])
-    
+
 -  |
    I can see that Meeting's calendar view is shown.
    then I click on the date on which I want schedule meeting.
    I fill proper data for that meeting and save it
-- 
+-
   !record {model: crm.meeting, id: crm_meeting_interviewcall0}:
     alarm_id: base_calendar.alarm3
     date: '2010-04-20 00:00:00'
@@ -73,20 +72,21 @@
     partner_id: base.res_partner_9
     phonecall_id: 'crm_phonecall_interviewcall0'
     state: open
-  
+
 - |
   In order to schedule other phonecall to the partner
   I click on "schedule other call" button. and plan for other call
   I can see that it will open other phonecall view with some data same as current
   phonecall.
-- 
+-
   !record {model: crm.phonecall2phonecall, id: crm_phonecall2phonecall_interviewcall0}:
     date: '2010-04-21 19:49:00'
     name: Interview call
     section_id: crm.section_sales_department
     user_id: base.user_root
+    categ_id: crm.categ_phone1
 - |
-  I click on "Schedule" button of this  wizard.    
+  I click on "Schedule" button of this  wizard.
 -
   !python {model: crm.phonecall2phonecall}: |
-    self.action_apply(cr, uid, [ref('crm_phonecall2phonecall_interviewcall0')], {'active_id': ref('crm_phonecall_interviewcall0')})     
+    self.action_apply(cr, uid, [ref('crm_phonecall2phonecall_interviewcall0')], {'active_id': ref('crm_phonecall_interviewcall0')})
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index bd2aaca0607..0b68d7f37ba 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -85,7 +85,7 @@ class crm_opportunity2phonecall(osv.osv_memory):
         This converts Opportunity to Phonecall and opens Phonecall view
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
+        @param uid: the current user's ID for security checks,
         @param ids: List of Opportunity to Phonecall IDs
         @param context: A standard dictionary for contextual values
 
diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml
index a4f546cbf83..d32256f63a9 100644
--- a/addons/document/document_data.xml
+++ b/addons/document/document_data.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="0">
-
-    <record model="document.directory.content.type" id="pdf">
-        <field name="code">.pdf</field>
-        <field name="name">PDF Report</field>
-        <field name="mimetype">application/pdf</field>
-    </record>
+<data noupdate="1">
     
     <record model="document.storage" id="storage_default">
         <field name="name">Database storage</field>
@@ -28,6 +22,14 @@
         <field name="ressource_id">0</field>
  
     </record>
+</data>
+
+<data noupdate="0">
+    <record model="document.directory.content.type" id="pdf">
+        <field name="code">.pdf</field>
+        <field name="name">PDF Report</field>
+        <field name="mimetype">application/pdf</field>
+    </record>
 
     <record model="document.directory" id="dir_partner_category">
         <field name="name">Partners by Category</field>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 41c3d478cce..08fa5e0d7d8 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -51,10 +51,6 @@
                 <search string="Departments">
                     <field name="name"/>
                     <field name="manager_id" />
-                    <newline />
-                    <group expand="0" string="Group By...">
-                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>
-                    </group>
                 </search>
              </field>
          </record>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5c257e9e6c9..c3f35762ff7 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -402,7 +402,7 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_job_filter"/>
             <field name="context">{"search_default_Current":1,"search_default_department_id": department_id}</field>
-            <field name="help">JJob Positions is used to define jobs and their requirements. You can attach a survey to a job position. This survey will be used in the recruitment process to evaluate the applicants for this job position.</field>
+            <field name="help">Job Positions are used to define jobs and their requirements. You can keep track of the number of employees you have per job position and how many you expect in the future. You can also attach a survey to a job position that will be used in the recruitment process to evaluate the applicants for this job position.</field>
         </record>
 
         <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_user"/>
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index bc9c1cc36e4..e7fd63eadb4 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -142,7 +142,7 @@ class hr_expense_expense(osv.osv):
                 else:
                     acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category')
                     if not acc:
-                        raise osv.except_osv(_('Error !'), _('Please configure Default Expanse account for Product purchase, `property_account_expense_categ`'))
+                        raise osv.except_osv(_('Error !'), _('Please configure Default Expense account for Product purchase, `property_account_expense_categ`'))
 
                 lines.append((0, False, {
                     'name': l.name,
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 83276ae63ee..9d6328af1eb 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -21,7 +21,6 @@
 #
 ##############################################################################
 
-import time
 import datetime
 from itertools import groupby
 from operator import itemgetter
diff --git a/addons/hr_payroll/hr_paroll_report.xml b/addons/hr_payroll/hr_paroll_report.xml
index 732b72f6a1d..2fae9bcf4c8 100644
--- a/addons/hr_payroll/hr_paroll_report.xml
+++ b/addons/hr_payroll/hr_paroll_report.xml
@@ -51,7 +51,7 @@
           	name="salary.structure" 
           	rml="hr_payroll/report/report_emp_salary_structure.rml"
           	menu = "True" 
-          	string="Salary Structure" />
+          	string="Salary Structure" groups="base.group_hr_manager"/>
   
 	</data>
 </openerp>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index f57fdbd2787..57282eed1e4 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -934,7 +934,7 @@
             </field>
         </record>
         <record id="action_contibution_register_form" model="ir.actions.act_window">
-            <field name="name">Contibution Register</field>
+            <field name="name">Contribution Register</field>
             <field name="res_model">hr.contibution.register</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="hr_contibution_register_tree"/>
@@ -960,13 +960,17 @@
             </field>
         </record>
 
+
+
         <!--  Shortcuts -->
         <act_window name="Payslips"
             domain="[('employee_id', '=', active_id)]"
             res_model="hr.payslip"
             src_model="hr.employee"
             view_id ="view_hr_payslip_tree"
-            id="act_hr_employee_payslip_list"/>
+            id="act_hr_employee_payslip_list"
+            groups="base.group_hr_manager"/>
+
     </data>
 </openerp>
 
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 35f638a3326..4668827ef89 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -64,7 +64,7 @@ class hr_employee(osv.osv):
             method=True,
             domain="[('type', '=', 'liquidity')]",
             view_load=True,
-            help="Select Bank Account from where Salary Expanse will be Paid"),
+            help="Select Bank Account from where Salary Expense will be Paid"),
         'salary_account':fields.property(
             'account.account',
             type='many2one',
@@ -73,7 +73,7 @@ class hr_employee(osv.osv):
             method=True,
             domain="[('type', '=', 'other')]",
             view_load=True,
-            help="Expanse account when Salary Expanse will be recorded"),
+            help="Expense account when Salary Expense will be recorded"),
         'employee_account':fields.property(
             'account.account',
             type='many2one',
@@ -99,7 +99,7 @@ class payroll_register(osv.osv):
     _description = 'Payroll Register'
 
     _columns = {
-        'journal_id': fields.many2one('account.journal', 'Expanse Journal'),
+        'journal_id': fields.many2one('account.journal', 'Expense Journal'),
         'bank_journal_id': fields.many2one('account.journal', 'Bank Journal'),
         'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
     }
@@ -213,7 +213,7 @@ class hr_payslip(osv.osv):
     _description = 'Pay Slip'
 
     _columns = {
-        'journal_id': fields.many2one('account.journal', 'Expanse Journal'),
+        'journal_id': fields.many2one('account.journal', 'Expense Journal'),
         'bank_journal_id': fields.many2one('account.journal', 'Bank Journal'),
         'move_ids':fields.one2many('hr.payslip.account.move', 'slip_id', 'Accounting vouchers'),
         'move_line_ids':fields.many2many('account.move.line', 'payslip_lines_rel', 'slip_id', 'line_id', 'Accounting Lines', readonly=True),
@@ -336,7 +336,7 @@ class hr_payslip(osv.osv):
                     name = '[%s]-%s' % (slip.number, line.name)
                     invoice_pool.pay_and_reconcile(cr, uid, invids, amount, acc_id, period_id, journal_id, False, period_id, False, context, name)
                     other_pay -= amount
-                    #TODO: link this account entries to the Payment Lines also Expanse Entries to Account Lines
+                    #TODO: link this account entries to the Payment Lines also Expense Entries to Account Lines
                     l_ids = movel_pool.search(cr, uid, [('name','=',name)], context=context)
                     line_ids += l_ids
 
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 7c158bb8795..2e941877b65 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -10,6 +10,7 @@
             <field name="view_id" ref="crm_case_tree_view_job"/>
             <field name="context">{"search_default_user_id":uid, 'search_default_current': 1,"search_default_department_id": department_id}</field>
             <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
+            <field name="help">From this menu you can track applicants in the recruitment process and manage all operations: meetings, interviews, phone calls, etc. If you setup the email gateway, applicants and their attached CV are created automatically when an email is sent to jobs@yourcompany.com. If you install the document management modules, all documents (CV and motivation letters) are indexed automatically, so that you can easily search through their content.</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_hr_sec_tree_view_act_job">
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index caeea1362ef..236f9d66fe1 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -23,11 +23,12 @@
     # Stage
     # ------------------------------------------------------
     <record id="hr_job_stage_act" model="ir.actions.act_window">
-        <field name="name">Applicant Stages</field>
+        <field name="name">Recruitment / Applicants Stages</field>
         <field name="res_model">hr.recruitment.stage</field>
         <field name="view_type">form</field>
         <field name="domain">[]</field>
         <field name="context">{}</field>
+        <field name="help">Define here your stages of the recruitment process, for example: qualification call, first interview, second interview, refused, hired.</field>
     </record>
 
 
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
index 90ba2aa7f6c..eb1437534d4 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
@@ -217,91 +217,3 @@ class report_timesheet_invoice(osv.osv):
         """)
 report_timesheet_invoice()
 
-class report_random_timsheet(osv.osv):
-    _name = "report.random.timesheet"
-    _description = "Random Timesheet Report"
-    _auto = False
-
-    _columns = {
-        'analytic_account_id': fields.many2one('account.analytic.account','Analytic Account', readonly=True),
-        'name': fields.char('Description', size=64, readonly=True),
-        'quantity': fields.float('Quantity', readonly=True),
-        'date': fields.date('Date', readonly=True),
-        'user_id': fields.many2one('res.users', 'User', readonly=True)
-    }
-    _order = "date desc"
-
-    def __init__(self, pool, cr):
-        super(report_random_timsheet, self).__init__(pool, cr)
-        self.called = False
-
-    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        """ To call the init() method timely
-        """
-        if not self.called:
-            self.init(cr, user)
-        self.called = True # To make sure that init doesn't get called multiple times
-
-        res = super(report_random_timsheet, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
-        return res
-
-    def init(self, cr, uid=1):
-        drop_view_if_exists(cr, 'report_random_timesheet')
-
-        cr.execute("""create or replace view report_random_timesheet as (
-
-            select
-                line.id as id, line.account_id as analytic_account_id, line.name as name,
-                line.unit_amount as quantity, line.date as date, line.user_id as user_id
-            from
-                account_analytic_line line, hr_department dept,hr_employee dept_user
-            where
-                (dept.id = dept_user.department_id AND dept_user.id=line.user_id AND line.user_id is not null)
-                AND (dept.manager_id = """ + str(uid) + """ )
-                AND (line.date <= CURRENT_DATE AND line.date > (CURRENT_DATE-3))
-            LIMIT 10
-            )
-            """ )
-
-report_random_timsheet()
-
-class random_timesheet_lines(osv.osv):
-    _name = "random.timesheet.lines"
-    _description = "Random Timesheet Lines"
-    _auto = False
-
-    _columns = {
-        'date': fields.date('Date', readonly=True),
-        'name': fields.char('Description', size=64, readonly=True),
-        'user_id': fields.many2one('res.users', 'User', readonly=True),
-        'quantity': fields.float('Quantity', readonly=True),
-        'product_id': fields.many2one('product.product', 'Product', readonly=True),
-        'analytic_account_id': fields.many2one('account.analytic.account','Analytic Account', readonly=True),
-        'uom_id': fields.many2one('product.uom', 'UoM', readonly=True),
-        'amount': fields.float('Amount', readonly=True),
-        'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Invoicing', readonly=True),
-        'general_account_id': fields.many2one('account.account', 'General Account', readonly=True)
-    }
-
-    _order = "date desc"
-
-    def init(self, cr):
-        drop_view_if_exists(cr, 'random_timesheet_lines')
-
-        cr.execute("""create or replace view random_timesheet_lines as (
-            select
-                line.id as id, line.date as date, line.name as name, line.unit_amount as quantity,
-                line.product_id as product_id, line.account_id as analytic_account_id,
-                line.product_uom_id as uom_id, line.amount as amount, line.to_invoice as to_invoice,
-                line.general_account_id as general_account_id, line.user_id as user_id
-            from
-                account_analytic_line line
-            where
-                (line.date <= CURRENT_DATE AND line.date > (CURRENT_DATE-15))
-            )
-            """ )
-
-random_timesheet_lines()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index b763f96c10a..1d2f5195687 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -425,85 +425,5 @@
         src_model="res.users"/>
 
 
-        <!-- Random Timesheet  -->
-
-        <record model="ir.ui.view" id="view_random_timesheet_tree">
-            <field name="name">report.random.timesheet.tree</field>
-            <field name="model">report.random.timesheet</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Random Timesheets">
-                    <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
-                    <field name="name" select="1"/>
-                    <field name="quantity" select="2" />
-                    <field name="date" select="1"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_random_timesheet_board">
-            <field name="name">Random Timesheet</field>
-            <field name="res_model">report.random.timesheet</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_random_timesheet_tree"/>
-        </record>
-
-        <!-- Random Timesheet Lines of random activities -->
-
-    <record id="view_random_timesheet_lines_search" model="ir.ui.view">
-            <field name="name">random.timesheet.lines.search</field>
-            <field name="model">random.timesheet.lines</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search Timesheet Lines">
-                   <group col='15' colspan='4'>
-                        <filter icon="terp-check" string="Current" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
-                        <separator orientation="vertical"/>
-                      <field name="user_id" widget="selection"/>
-                      <field name="product_id" widget="selection"/>
-                   </group>
-                   <newline/>
-                   <group expand="0" string="Group By...">
-                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Analytic Account" icon="terp-folder-violet" domain="[]" context="{'group_by':'analytic_account_id'}"/>
-                       <filter string="General Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'general_account_id'}"/>
-                   </group>
-               </search>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_random_timesheet_lines_tree">
-            <field name="name">random.timesheet.lines.tree</field>
-            <field name="model">random.timesheet.lines</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Random Timesheets Lines">
-                    <field name="date" select="1"/>
-                    <field name="user_id"/>
-                    <field name="name" select="1"/>
-                    <field name="quantity" />
-                    <field name="product_id" select="1"/>
-                    <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
-                    <field name="uom_id" />
-                    <field name="amount" />
-                    <field name="to_invoice" select="1"/>
-                    <field name="general_account_id" />
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_random_timesheet_lines_board">
-            <field name="type">ir.actions.act_window</field>
-            <field name="name">Working Hours</field>
-            <field name="res_model">random.timesheet.lines</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_user_id':uid }</field>
-            <field name="view_id" ref="view_random_timesheet_lines_tree"/>
-            <field name="search_view_id" ref="view_random_timesheet_lines_search"/>
-        </record>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/security/ir.model.access.csv b/addons/hr_timesheet_invoice/security/ir.model.access.csv
index c647fec62cf..9d8c41be2cd 100644
--- a/addons/hr_timesheet_invoice/security/ir.model.access.csv
+++ b/addons/hr_timesheet_invoice/security/ir.model.access.csv
@@ -7,8 +7,6 @@
 "access_report_timesheet_account","report_timesheet.account","model_report_timesheet_account","base.group_hr_manager",1,1,1,1
 "access_report_timesheet_account_date","report_timesheet.account.date","model_report_timesheet_account_date","base.group_hr_manager",1,1,1,1
 "access_report_timesheet_invoice","report_timesheet.invoice","model_report_timesheet_invoice","base.group_hr_manager",1,1,1,1
-"access_report_random_timesheet","report_random_timesheet","model_report_random_timesheet","base.group_hr_manager",1,1,1,1
-"access_report_random_timesheet_lines","random_timesheet_lines","model_random_timesheet_lines","base.group_hr_manager",1,1,1,1
 "access_report_analytic_account_close_manager","report.analytic.account.close.manager","model_report_analytic_account_close","base.group_hr_manager",1,1,1,1
 "access_report_account_analytic_line_to_invoice_manager","report.account.analytic.line.to.invoice.manager","model_report_account_analytic_line_to_invoice","base.group_hr_manager",1,1,1,1
 "access_account_invoice_hr_user","account.invoice.hr.user","account.model_account_invoice","base.group_hr_user",1,1,1,1
diff --git a/addons/l10n_es/account_chart.xml b/addons/l10n_es/account_chart.xml
index 6e56007fc46..df0b218ae49 100644
--- a/addons/l10n_es/account_chart.xml
+++ b/addons/l10n_es/account_chart.xml
@@ -33,13 +33,13 @@
             <field name="code">terceros</field>
             <field name="close_method">balance</field>
         </record>
-        <record id="terceros - rec" model="account.account.type">
+        <record id="terceros_-_rec" model="account.account.type">
             <field name="name">Terceros - A Cobrar</field>
             <field name="code">terceros - rec</field>
             <field name="report_type">asset</field>
             <field name="close_method">balance</field>
         </record>
-        <record id="terceros - pay" model="account.account.type">
+        <record id="terceros_-_pay" model="account.account.type">
             <field name="name">Terceros - A Pagar</field>
             <field name="code">terceros - pay</field>
             <field name="report_type">liability</field>
@@ -3883,7 +3883,7 @@
             <field name="parent_id" ref="pgc_4"/>
             <field name="type">view</field>
             <field name="name">Proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_400" model="account.account.template">
             <field name="code">400</field>
@@ -3891,7 +3891,7 @@
             <field name="parent_id" ref="pgc_40"/>
             <field name="type">view</field>
             <field name="name">Proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4000" model="account.account.template">
             <field name="code">4000</field>
@@ -3899,7 +3899,7 @@
             <field name="parent_id" ref="pgc_400"/>
             <field name="type">view</field>
             <field name="name">Proveedores (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4000_child" model="account.account.template">
             <field name="code">4000</field>
@@ -3907,7 +3907,7 @@
             <field name="parent_id" ref="pgc_4000"/>
             <field name="type">payable</field>
             <field name="name">Proveedores (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4004" model="account.account.template">
             <field name="code">4004</field>
@@ -3915,7 +3915,7 @@
             <field name="parent_id" ref="pgc_400"/>
             <field name="type">view</field>
             <field name="name">Proveedores (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4004_child" model="account.account.template">
             <field name="code">4004</field>
@@ -3923,7 +3923,7 @@
             <field name="parent_id" ref="pgc_4004"/>
             <field name="type">payable</field>
             <field name="name">Proveedores (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4009" model="account.account.template">
             <field name="code">4009</field>
@@ -3931,7 +3931,7 @@
             <field name="parent_id" ref="pgc_400"/>
             <field name="type">view</field>
             <field name="name">Proveedores, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4009_child" model="account.account.template">
             <field name="code">4009</field>
@@ -3939,7 +3939,7 @@
             <field name="parent_id" ref="pgc_4009"/>
             <field name="type">payable</field>
             <field name="name">Proveedores, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_401" model="account.account.template">
             <field name="code">401</field>
@@ -3947,7 +3947,7 @@
             <field name="parent_id" ref="pgc_40"/>
             <field name="type">view</field>
             <field name="name">Proveedores, efectos comerciales a pagar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_401_child" model="account.account.template">
             <field name="code">401</field>
@@ -3955,7 +3955,7 @@
             <field name="parent_id" ref="pgc_401"/>
             <field name="type">other</field>
             <field name="name">Proveedores, efectos comerciales a pagar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_403" model="account.account.template">
             <field name="code">403</field>
@@ -3963,7 +3963,7 @@
             <field name="parent_id" ref="pgc_40"/>
             <field name="type">view</field>
             <field name="name">Proveedores, empresas del grupo</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4030" model="account.account.template">
             <field name="code">4030</field>
@@ -3971,7 +3971,7 @@
             <field name="parent_id" ref="pgc_403"/>
             <field name="type">view</field>
             <field name="name">Proveedores, empresas del grupo (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4030_child" model="account.account.template">
             <field name="code">4030</field>
@@ -3979,7 +3979,7 @@
             <field name="parent_id" ref="pgc_4030"/>
             <field name="type">payable</field>
             <field name="name">Proveedores, empresas del grupo (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4031" model="account.account.template">
             <field name="code">4031</field>
@@ -3987,7 +3987,7 @@
             <field name="parent_id" ref="pgc_403"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales a pagar, empresas del grupo</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4031_child" model="account.account.template">
             <field name="code">4031</field>
@@ -3995,7 +3995,7 @@
             <field name="parent_id" ref="pgc_4031"/>
             <field name="type">payable</field>
             <field name="name">Efectos comerciales a pagar, empresas del grupo</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4034" model="account.account.template">
             <field name="code">4034</field>
@@ -4003,7 +4003,7 @@
             <field name="parent_id" ref="pgc_403"/>
             <field name="type">view</field>
             <field name="name">Proveedores, empresas del grupo (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4034_child" model="account.account.template">
             <field name="code">4034</field>
@@ -4011,7 +4011,7 @@
             <field name="parent_id" ref="pgc_4034"/>
             <field name="type">payable</field>
             <field name="name">Proveedores, empresas del grupo (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4036" model="account.account.template">
             <field name="code">4036</field>
@@ -4019,7 +4019,7 @@
             <field name="parent_id" ref="pgc_403"/>
             <field name="type">view</field>
             <field name="name">Envases y embalajes a devolver a proveedores, empresas del grupo</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4036_child" model="account.account.template">
             <field name="code">4036</field>
@@ -4027,7 +4027,7 @@
             <field name="parent_id" ref="pgc_4036"/>
             <field name="type">payable</field>
             <field name="name">Envases y embalajes a devolver a proveedores, empresas del grupo</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4039" model="account.account.template">
             <field name="code">4039</field>
@@ -4035,7 +4035,7 @@
             <field name="parent_id" ref="pgc_403"/>
             <field name="type">view</field>
             <field name="name">Proveedores, empresas del grupo, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4039_child" model="account.account.template">
             <field name="code">4039</field>
@@ -4043,7 +4043,7 @@
             <field name="parent_id" ref="pgc_4039"/>
             <field name="type">payable</field>
             <field name="name">Proveedores, empresas del grupo, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_404" model="account.account.template">
             <field name="code">404</field>
@@ -4051,7 +4051,7 @@
             <field name="parent_id" ref="pgc_40"/>
             <field name="type">view</field>
             <field name="name">Proveedores, empresas asociadas</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_404_child" model="account.account.template">
             <field name="code">404</field>
@@ -4059,7 +4059,7 @@
             <field name="parent_id" ref="pgc_404"/>
             <field name="type">other</field>
             <field name="name">Proveedores, empresas asociadas</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_405" model="account.account.template">
             <field name="code">405</field>
@@ -4067,7 +4067,7 @@
             <field name="parent_id" ref="pgc_40"/>
             <field name="type">view</field>
             <field name="name">Proveedores, otras partes vinculadas</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_405_child" model="account.account.template">
             <field name="code">405</field>
@@ -4075,7 +4075,7 @@
             <field name="parent_id" ref="pgc_405"/>
             <field name="type">other</field>
             <field name="name">Proveedores, otras partes vinculadas</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_406" model="account.account.template">
             <field name="code">406</field>
@@ -4083,7 +4083,7 @@
             <field name="parent_id" ref="pgc_40"/>
             <field name="type">view</field>
             <field name="name">Envases y embalajes a devolver a proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_406_child" model="account.account.template">
             <field name="code">406</field>
@@ -4091,7 +4091,7 @@
             <field name="parent_id" ref="pgc_406"/>
             <field name="type">other</field>
             <field name="name">Envases y embalajes a devolver a proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_407" model="account.account.template">
             <field name="code">407</field>
@@ -4099,7 +4099,7 @@
             <field name="parent_id" ref="pgc_40"/>
             <field name="type">view</field>
             <field name="name">Anticipos a proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_407_child" model="account.account.template">
             <field name="code">407</field>
@@ -4107,7 +4107,7 @@
             <field name="parent_id" ref="pgc_407"/>
             <field name="type">other</field>
             <field name="name">Anticipos a proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_41" model="account.account.template">
             <field name="code">41</field>
@@ -4115,7 +4115,7 @@
             <field name="parent_id" ref="pgc_4"/>
             <field name="type">view</field>
             <field name="name">Acreedores varios</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_410" model="account.account.template">
             <field name="code">410</field>
@@ -4123,7 +4123,7 @@
             <field name="parent_id" ref="pgc_41"/>
             <field name="type">view</field>
             <field name="name">Acreedores por prestaciones de servicios</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4100" model="account.account.template">
             <field name="code">4100</field>
@@ -4131,7 +4131,7 @@
             <field name="parent_id" ref="pgc_410"/>
             <field name="type">view</field>
             <field name="name">Acreedores por prestaciones de servicios (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4100_child" model="account.account.template">
             <field name="code">4100</field>
@@ -4139,7 +4139,7 @@
             <field name="parent_id" ref="pgc_4100"/>
             <field name="type">payable</field>
             <field name="name">Acreedores por prestaciones de servicios (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4104" model="account.account.template">
             <field name="code">4104</field>
@@ -4147,7 +4147,7 @@
             <field name="parent_id" ref="pgc_410"/>
             <field name="type">view</field>
             <field name="name">Acreedores por prestaciones de servicios (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4104_child" model="account.account.template">
             <field name="code">4104</field>
@@ -4155,7 +4155,7 @@
             <field name="parent_id" ref="pgc_4104"/>
             <field name="type">payable</field>
             <field name="name">Acreedores por prestaciones de servicios (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4109" model="account.account.template">
             <field name="code">4109</field>
@@ -4163,7 +4163,7 @@
             <field name="parent_id" ref="pgc_410"/>
             <field name="type">view</field>
             <field name="name">Acreedores por prestaciones de servicios, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4109_child" model="account.account.template">
             <field name="code">4109</field>
@@ -4171,7 +4171,7 @@
             <field name="parent_id" ref="pgc_4109"/>
             <field name="type">payable</field>
             <field name="name">Acreedores por prestaciones de servicios, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_411" model="account.account.template">
             <field name="code">411</field>
@@ -4179,7 +4179,7 @@
             <field name="parent_id" ref="pgc_41"/>
             <field name="type">view</field>
             <field name="name">Acreedores, efectos comerciales a pagar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_411_child" model="account.account.template">
             <field name="code">411</field>
@@ -4187,7 +4187,7 @@
             <field name="parent_id" ref="pgc_411"/>
             <field name="type">other</field>
             <field name="name">Acreedores, efectos comerciales a pagar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_419" model="account.account.template">
             <field name="code">419</field>
@@ -4195,7 +4195,7 @@
             <field name="parent_id" ref="pgc_41"/>
             <field name="type">view</field>
             <field name="name">Acreedores por operaciones en común</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_419_child" model="account.account.template">
             <field name="code">419</field>
@@ -4203,7 +4203,7 @@
             <field name="parent_id" ref="pgc_419"/>
             <field name="type">other</field>
             <field name="name">Acreedores por operaciones en común</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_43" model="account.account.template">
             <field name="code">43</field>
@@ -4211,7 +4211,7 @@
             <field name="parent_id" ref="pgc_4"/>
             <field name="type">view</field>
             <field name="name">Clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_430" model="account.account.template">
             <field name="code">430</field>
@@ -4219,7 +4219,7 @@
             <field name="parent_id" ref="pgc_43"/>
             <field name="type">view</field>
             <field name="name">Clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4300" model="account.account.template">
             <field name="code">4300</field>
@@ -4227,7 +4227,7 @@
             <field name="parent_id" ref="pgc_430"/>
             <field name="type">view</field>
             <field name="name">Clientes (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4300_child" model="account.account.template">
             <field name="code">4300</field>
@@ -4235,7 +4235,7 @@
             <field name="parent_id" ref="pgc_4300"/>
             <field name="type">receivable</field>
             <field name="name">Clientes (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4304" model="account.account.template">
             <field name="code">4304</field>
@@ -4243,7 +4243,7 @@
             <field name="parent_id" ref="pgc_430"/>
             <field name="type">view</field>
             <field name="name">Clientes (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4304_child" model="account.account.template">
             <field name="code">4304</field>
@@ -4251,7 +4251,7 @@
             <field name="parent_id" ref="pgc_4304"/>
             <field name="type">receivable</field>
             <field name="name">Clientes (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4309" model="account.account.template">
             <field name="code">4309</field>
@@ -4259,7 +4259,7 @@
             <field name="parent_id" ref="pgc_430"/>
             <field name="type">view</field>
             <field name="name">Clientes, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4309_child" model="account.account.template">
             <field name="code">4309</field>
@@ -4267,7 +4267,7 @@
             <field name="parent_id" ref="pgc_4309"/>
             <field name="type">receivable</field>
             <field name="name">Clientes, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_431" model="account.account.template">
             <field name="code">431</field>
@@ -4275,7 +4275,7 @@
             <field name="parent_id" ref="pgc_43"/>
             <field name="type">view</field>
             <field name="name">Clientes, efectos comerciales a cobrar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4310" model="account.account.template">
             <field name="code">4310</field>
@@ -4283,7 +4283,7 @@
             <field name="parent_id" ref="pgc_431"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales en cartera</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4310_child" model="account.account.template">
             <field name="code">4310</field>
@@ -4291,7 +4291,7 @@
             <field name="parent_id" ref="pgc_4310"/>
             <field name="type">receivable</field>
             <field name="name">Efectos comerciales en cartera</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4311" model="account.account.template">
             <field name="code">4311</field>
@@ -4299,7 +4299,7 @@
             <field name="parent_id" ref="pgc_431"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales descontados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4311_child" model="account.account.template">
             <field name="code">4311</field>
@@ -4307,7 +4307,7 @@
             <field name="parent_id" ref="pgc_4311"/>
             <field name="type">receivable</field>
             <field name="name">Efectos comerciales descontados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4312" model="account.account.template">
             <field name="code">4312</field>
@@ -4315,7 +4315,7 @@
             <field name="parent_id" ref="pgc_431"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales en gestión de cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4312_child" model="account.account.template">
             <field name="code">4312</field>
@@ -4323,7 +4323,7 @@
             <field name="parent_id" ref="pgc_4312"/>
             <field name="type">receivable</field>
             <field name="name">Efectos comerciales en gestión de cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4315" model="account.account.template">
             <field name="code">4315</field>
@@ -4331,7 +4331,7 @@
             <field name="parent_id" ref="pgc_431"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales impagados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4315_child" model="account.account.template">
             <field name="code">4315</field>
@@ -4339,7 +4339,7 @@
             <field name="parent_id" ref="pgc_4315"/>
             <field name="type">receivable</field>
             <field name="name">Efectos comerciales impagados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_432" model="account.account.template">
             <field name="code">432</field>
@@ -4347,7 +4347,7 @@
             <field name="parent_id" ref="pgc_43"/>
             <field name="type">view</field>
             <field name="name">Clientes, operaciones de factoring</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_432_child" model="account.account.template">
             <field name="code">432</field>
@@ -4355,7 +4355,7 @@
             <field name="parent_id" ref="pgc_432"/>
             <field name="type">other</field>
             <field name="name">Clientes, operaciones de factoring</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_433" model="account.account.template">
             <field name="code">433</field>
@@ -4363,7 +4363,7 @@
             <field name="parent_id" ref="pgc_43"/>
             <field name="type">view</field>
             <field name="name">Clientes, empresas del grupo</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4330" model="account.account.template">
             <field name="code">4330</field>
@@ -4371,7 +4371,7 @@
             <field name="parent_id" ref="pgc_433"/>
             <field name="type">view</field>
             <field name="name">Clientes empresas del grupo (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4330_child" model="account.account.template">
             <field name="code">4330</field>
@@ -4379,7 +4379,7 @@
             <field name="parent_id" ref="pgc_4330"/>
             <field name="type">receivable</field>
             <field name="name">Clientes empresas del grupo (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4331" model="account.account.template">
             <field name="code">4331</field>
@@ -4387,7 +4387,7 @@
             <field name="parent_id" ref="pgc_433"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales a cobrar, empresas del grupo</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4331_child" model="account.account.template">
             <field name="code">4331</field>
@@ -4395,7 +4395,7 @@
             <field name="parent_id" ref="pgc_4331"/>
             <field name="type">receivable</field>
             <field name="name">Efectos comerciales a cobrar, empresas del grupo</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4332" model="account.account.template">
             <field name="code">4332</field>
@@ -4403,7 +4403,7 @@
             <field name="parent_id" ref="pgc_433"/>
             <field name="type">view</field>
             <field name="name">Clientes empresas del grupo, operaciones de factoring</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4332_child" model="account.account.template">
             <field name="code">4332</field>
@@ -4411,7 +4411,7 @@
             <field name="parent_id" ref="pgc_4332"/>
             <field name="type">receivable</field>
             <field name="name">Clientes empresas del grupo, operaciones de factoring</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4334" model="account.account.template">
             <field name="code">4334</field>
@@ -4419,7 +4419,7 @@
             <field name="parent_id" ref="pgc_433"/>
             <field name="type">view</field>
             <field name="name">Clientes empresas del grupo (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4334_child" model="account.account.template">
             <field name="code">4334</field>
@@ -4427,7 +4427,7 @@
             <field name="parent_id" ref="pgc_4334"/>
             <field name="type">receivable</field>
             <field name="name">Clientes empresas del grupo (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4336" model="account.account.template">
             <field name="code">4336</field>
@@ -4435,7 +4435,7 @@
             <field name="parent_id" ref="pgc_433"/>
             <field name="type">view</field>
             <field name="name">Clientes empresas del grupo de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4336_child" model="account.account.template">
             <field name="code">4336</field>
@@ -4443,7 +4443,7 @@
             <field name="parent_id" ref="pgc_4336"/>
             <field name="type">receivable</field>
             <field name="name">Clientes empresas del grupo de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4337" model="account.account.template">
             <field name="code">4337</field>
@@ -4451,7 +4451,7 @@
             <field name="parent_id" ref="pgc_433"/>
             <field name="type">view</field>
             <field name="name">Envases y embalajes a devolver a clientes, empresas del grupo</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4337_child" model="account.account.template">
             <field name="code">4337</field>
@@ -4459,7 +4459,7 @@
             <field name="parent_id" ref="pgc_4337"/>
             <field name="type">receivable</field>
             <field name="name">Envases y embalajes a devolver a clientes, empresas del grupo</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4339" model="account.account.template">
             <field name="code">4339</field>
@@ -4467,7 +4467,7 @@
             <field name="parent_id" ref="pgc_433"/>
             <field name="type">view</field>
             <field name="name">Clientes empresas del grupo, facturas pendientes de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4339_child" model="account.account.template">
             <field name="code">4339</field>
@@ -4475,7 +4475,7 @@
             <field name="parent_id" ref="pgc_4339"/>
             <field name="type">receivable</field>
             <field name="name">Clientes empresas del grupo, facturas pendientes de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_434" model="account.account.template">
             <field name="code">434</field>
@@ -4483,7 +4483,7 @@
             <field name="parent_id" ref="pgc_43"/>
             <field name="type">view</field>
             <field name="name">Clientes, empresas asociadas</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_434_child" model="account.account.template">
             <field name="code">434</field>
@@ -4491,7 +4491,7 @@
             <field name="parent_id" ref="pgc_434"/>
             <field name="type">other</field>
             <field name="name">Clientes, empresas asociadas</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_435" model="account.account.template">
             <field name="code">435</field>
@@ -4499,7 +4499,7 @@
             <field name="parent_id" ref="pgc_43"/>
             <field name="type">view</field>
             <field name="name">Clientes, otras partes vinculadas</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_435_child" model="account.account.template">
             <field name="code">435</field>
@@ -4507,7 +4507,7 @@
             <field name="parent_id" ref="pgc_435"/>
             <field name="type">other</field>
             <field name="name">Clientes, otras partes vinculadas</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_436" model="account.account.template">
             <field name="code">436</field>
@@ -4515,7 +4515,7 @@
             <field name="parent_id" ref="pgc_43"/>
             <field name="type">view</field>
             <field name="name">Clientes de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_436_child" model="account.account.template">
             <field name="code">436</field>
@@ -4523,7 +4523,7 @@
             <field name="parent_id" ref="pgc_436"/>
             <field name="type">other</field>
             <field name="name">Clientes de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_437" model="account.account.template">
             <field name="code">437</field>
@@ -4531,7 +4531,7 @@
             <field name="parent_id" ref="pgc_43"/>
             <field name="type">view</field>
             <field name="name">Envases y embalajes a devolver por clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_437_child" model="account.account.template">
             <field name="code">437</field>
@@ -4539,7 +4539,7 @@
             <field name="parent_id" ref="pgc_437"/>
             <field name="type">other</field>
             <field name="name">Envases y embalajes a devolver por clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_438" model="account.account.template">
             <field name="code">438</field>
@@ -4547,7 +4547,7 @@
             <field name="parent_id" ref="pgc_43"/>
             <field name="type">view</field>
             <field name="name">Anticipos de clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_438_child" model="account.account.template">
             <field name="code">438</field>
@@ -4555,7 +4555,7 @@
             <field name="parent_id" ref="pgc_438"/>
             <field name="type">other</field>
             <field name="name">Anticipos de clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_44" model="account.account.template">
             <field name="code">44</field>
@@ -4563,7 +4563,7 @@
             <field name="parent_id" ref="pgc_4"/>
             <field name="type">view</field>
             <field name="name">Deudores varios</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_440" model="account.account.template">
             <field name="code">440</field>
@@ -4571,7 +4571,7 @@
             <field name="parent_id" ref="pgc_44"/>
             <field name="type">view</field>
             <field name="name">Deudores</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4400" model="account.account.template">
             <field name="code">4400</field>
@@ -4579,7 +4579,7 @@
             <field name="parent_id" ref="pgc_440"/>
             <field name="type">view</field>
             <field name="name">Deudores (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4400_child" model="account.account.template">
             <field name="code">4400</field>
@@ -4587,7 +4587,7 @@
             <field name="parent_id" ref="pgc_4400"/>
             <field name="type">receivable</field>
             <field name="name">Deudores (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4404" model="account.account.template">
             <field name="code">4404</field>
@@ -4595,7 +4595,7 @@
             <field name="parent_id" ref="pgc_440"/>
             <field name="type">view</field>
             <field name="name">Deudores (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4404_child" model="account.account.template">
             <field name="code">4404</field>
@@ -4603,7 +4603,7 @@
             <field name="parent_id" ref="pgc_4404"/>
             <field name="type">receivable</field>
             <field name="name">Deudores (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4409" model="account.account.template">
             <field name="code">4409</field>
@@ -4611,7 +4611,7 @@
             <field name="parent_id" ref="pgc_440"/>
             <field name="type">view</field>
             <field name="name">Deudores, facturas pendientes de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4409_child" model="account.account.template">
             <field name="code">4409</field>
@@ -4619,7 +4619,7 @@
             <field name="parent_id" ref="pgc_4409"/>
             <field name="type">receivable</field>
             <field name="name">Deudores, facturas pendientes de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_441" model="account.account.template">
             <field name="code">441</field>
@@ -4627,7 +4627,7 @@
             <field name="parent_id" ref="pgc_44"/>
             <field name="type">view</field>
             <field name="name">Deudores, efectos comerciales a cobrar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4410" model="account.account.template">
             <field name="code">4410</field>
@@ -4635,7 +4635,7 @@
             <field name="parent_id" ref="pgc_441"/>
             <field name="type">view</field>
             <field name="name">Deudores, efectos comerciales en cartera</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4410_child" model="account.account.template">
             <field name="code">4410</field>
@@ -4643,7 +4643,7 @@
             <field name="parent_id" ref="pgc_4410"/>
             <field name="type">receivable</field>
             <field name="name">Deudores, efectos comerciales en cartera</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4411" model="account.account.template">
             <field name="code">4411</field>
@@ -4651,7 +4651,7 @@
             <field name="parent_id" ref="pgc_441"/>
             <field name="type">view</field>
             <field name="name">Deudores, efectos comerciales descontados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4411_child" model="account.account.template">
             <field name="code">4411</field>
@@ -4659,7 +4659,7 @@
             <field name="parent_id" ref="pgc_4411"/>
             <field name="type">receivable</field>
             <field name="name">Deudores, efectos comerciales descontados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4412" model="account.account.template">
             <field name="code">4412</field>
@@ -4667,7 +4667,7 @@
             <field name="parent_id" ref="pgc_441"/>
             <field name="type">view</field>
             <field name="name">Deudores, efectos comerciales en gestión de cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4412_child" model="account.account.template">
             <field name="code">4412</field>
@@ -4675,7 +4675,7 @@
             <field name="parent_id" ref="pgc_4412"/>
             <field name="type">receivable</field>
             <field name="name">Deudores, efectos comerciales en gestión de cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4415" model="account.account.template">
             <field name="code">4415</field>
@@ -4683,7 +4683,7 @@
             <field name="parent_id" ref="pgc_441"/>
             <field name="type">view</field>
             <field name="name">Deudores, efectos comerciales impagados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4415_child" model="account.account.template">
             <field name="code">4415</field>
@@ -4691,7 +4691,7 @@
             <field name="parent_id" ref="pgc_4415"/>
             <field name="type">receivable</field>
             <field name="name">Deudores, efectos comerciales impagados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_446" model="account.account.template">
             <field name="code">446</field>
@@ -4699,7 +4699,7 @@
             <field name="parent_id" ref="pgc_44"/>
             <field name="type">view</field>
             <field name="name">Deudores de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_446_child" model="account.account.template">
             <field name="code">446</field>
@@ -4707,7 +4707,7 @@
             <field name="parent_id" ref="pgc_446"/>
             <field name="type">other</field>
             <field name="name">Deudores de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_449" model="account.account.template">
             <field name="code">449</field>
@@ -4715,7 +4715,7 @@
             <field name="parent_id" ref="pgc_44"/>
             <field name="type">view</field>
             <field name="name">Deudores por operaciones en común</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_449_child" model="account.account.template">
             <field name="code">449</field>
@@ -4723,7 +4723,7 @@
             <field name="parent_id" ref="pgc_449"/>
             <field name="type">other</field>
             <field name="name">Deudores por operaciones en común</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_46" model="account.account.template">
             <field name="code">46</field>
@@ -4739,7 +4739,7 @@
             <field name="parent_id" ref="pgc_46"/>
             <field name="type">view</field>
             <field name="name">Anticipos de remuneraciones</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_460_child" model="account.account.template">
             <field name="code">460</field>
@@ -4747,7 +4747,7 @@
             <field name="parent_id" ref="pgc_460"/>
             <field name="type">other</field>
             <field name="name">Anticipos de remuneraciones</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_465" model="account.account.template">
             <field name="code">465</field>
@@ -4755,7 +4755,7 @@
             <field name="parent_id" ref="pgc_46"/>
             <field name="type">view</field>
             <field name="name">Remuneraciones pendientes de pago</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_465_child" model="account.account.template">
             <field name="code">465</field>
@@ -4763,7 +4763,7 @@
             <field name="parent_id" ref="pgc_465"/>
             <field name="type">other</field>
             <field name="name">Remuneraciones pendientes de pago</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_466" model="account.account.template">
             <field name="code">466</field>
@@ -4771,7 +4771,7 @@
             <field name="parent_id" ref="pgc_46"/>
             <field name="type">view</field>
             <field name="name">Remuneraciones mediante sistemas de aportación definida pendientes de pago</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_466_child" model="account.account.template">
             <field name="code">466</field>
@@ -4779,7 +4779,7 @@
             <field name="parent_id" ref="pgc_466"/>
             <field name="type">other</field>
             <field name="name">Remuneraciones mediante sistemas de aportación definida pendientes de pago</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_47" model="account.account.template">
             <field name="code">47</field>
@@ -5059,7 +5059,7 @@
             <field name="parent_id" ref="pgc_48"/>
             <field name="type">view</field>
             <field name="name">Gastos anticipados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_480_child" model="account.account.template">
             <field name="code">480</field>
@@ -5067,7 +5067,7 @@
             <field name="parent_id" ref="pgc_480"/>
             <field name="type">other</field>
             <field name="name">Gastos anticipados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_485" model="account.account.template">
             <field name="code">485</field>
@@ -5075,7 +5075,7 @@
             <field name="parent_id" ref="pgc_48"/>
             <field name="type">view</field>
             <field name="name">Ingresos anticipados</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_485_child" model="account.account.template">
             <field name="code">485</field>
@@ -5083,7 +5083,7 @@
             <field name="parent_id" ref="pgc_485"/>
             <field name="type">other</field>
             <field name="name">Ingresos anticipados</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_49" model="account.account.template">
             <field name="code">49</field>
diff --git a/addons/l10n_es/account_chart_pymes.xml b/addons/l10n_es/account_chart_pymes.xml
index 50ab4987113..2e52df600ab 100644
--- a/addons/l10n_es/account_chart_pymes.xml
+++ b/addons/l10n_es/account_chart_pymes.xml
@@ -3550,7 +3550,7 @@
             <field name="parent_id" ref="pgc_pymes_4"/>
             <field name="type">view</field>
             <field name="name">Proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_400" model="account.account.template">
             <field name="code">400</field>
@@ -3558,7 +3558,7 @@
             <field name="parent_id" ref="pgc_pymes_40"/>
             <field name="type">view</field>
             <field name="name">Proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4000" model="account.account.template">
             <field name="code">4000</field>
@@ -3566,7 +3566,7 @@
             <field name="parent_id" ref="pgc_pymes_400"/>
             <field name="type">view</field>
             <field name="name">Proveedores (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4000_child" model="account.account.template">
             <field name="code">4000</field>
@@ -3574,7 +3574,7 @@
             <field name="parent_id" ref="pgc_pymes_4000"/>
             <field name="type">payable</field>
             <field name="name">Proveedores (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4004" model="account.account.template">
             <field name="code">4004</field>
@@ -3582,7 +3582,7 @@
             <field name="parent_id" ref="pgc_pymes_400"/>
             <field name="type">view</field>
             <field name="name">Proveedores (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4004_child" model="account.account.template">
             <field name="code">4004</field>
@@ -3590,7 +3590,7 @@
             <field name="parent_id" ref="pgc_pymes_4004"/>
             <field name="type">payable</field>
             <field name="name">Proveedores (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4009" model="account.account.template">
             <field name="code">4009</field>
@@ -3598,7 +3598,7 @@
             <field name="parent_id" ref="pgc_pymes_400"/>
             <field name="type">view</field>
             <field name="name">Proveedores, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4009_child" model="account.account.template">
             <field name="code">4009</field>
@@ -3606,7 +3606,7 @@
             <field name="parent_id" ref="pgc_pymes_4009"/>
             <field name="type">payable</field>
             <field name="name">Proveedores, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_401" model="account.account.template">
             <field name="code">401</field>
@@ -3614,7 +3614,7 @@
             <field name="parent_id" ref="pgc_pymes_40"/>
             <field name="type">view</field>
             <field name="name">Proveedores, efectos comerciales a pagar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_401_child" model="account.account.template">
             <field name="code">401</field>
@@ -3622,7 +3622,7 @@
             <field name="parent_id" ref="pgc_pymes_401"/>
             <field name="type">other</field>
             <field name="name">Proveedores, efectos comerciales a pagar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_403" model="account.account.template">
             <field name="code">403</field>
@@ -3630,7 +3630,7 @@
             <field name="parent_id" ref="pgc_pymes_40"/>
             <field name="type">view</field>
             <field name="name">Proveedores, empresas del grupo</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4030" model="account.account.template">
             <field name="code">4030</field>
@@ -3638,7 +3638,7 @@
             <field name="parent_id" ref="pgc_pymes_403"/>
             <field name="type">view</field>
             <field name="name">Proveedores, empresas del grupo (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4030_child" model="account.account.template">
             <field name="code">4030</field>
@@ -3646,7 +3646,7 @@
             <field name="parent_id" ref="pgc_pymes_4030"/>
             <field name="type">payable</field>
             <field name="name">Proveedores, empresas del grupo (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4031" model="account.account.template">
             <field name="code">4031</field>
@@ -3654,7 +3654,7 @@
             <field name="parent_id" ref="pgc_pymes_403"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales a pagar, empresas del grupo</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4031_child" model="account.account.template">
             <field name="code">4031</field>
@@ -3662,7 +3662,7 @@
             <field name="parent_id" ref="pgc_pymes_4031"/>
             <field name="type">payable</field>
             <field name="name">Efectos comerciales a pagar, empresas del grupo</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4034" model="account.account.template">
             <field name="code">4034</field>
@@ -3670,7 +3670,7 @@
             <field name="parent_id" ref="pgc_pymes_403"/>
             <field name="type">view</field>
             <field name="name">Proveedores, empresas del grupo (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4034_child" model="account.account.template">
             <field name="code">4034</field>
@@ -3678,7 +3678,7 @@
             <field name="parent_id" ref="pgc_pymes_4034"/>
             <field name="type">payable</field>
             <field name="name">Proveedores, empresas del grupo (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4036" model="account.account.template">
             <field name="code">4036</field>
@@ -3686,7 +3686,7 @@
             <field name="parent_id" ref="pgc_pymes_403"/>
             <field name="type">view</field>
             <field name="name">Envases y embalajes a devolver a proveedores, empresas del grupo</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4036_child" model="account.account.template">
             <field name="code">4036</field>
@@ -3694,7 +3694,7 @@
             <field name="parent_id" ref="pgc_pymes_4036"/>
             <field name="type">payable</field>
             <field name="name">Envases y embalajes a devolver a proveedores, empresas del grupo</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4039" model="account.account.template">
             <field name="code">4039</field>
@@ -3702,7 +3702,7 @@
             <field name="parent_id" ref="pgc_pymes_403"/>
             <field name="type">view</field>
             <field name="name">Proveedores, empresas del grupo, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4039_child" model="account.account.template">
             <field name="code">4039</field>
@@ -3710,7 +3710,7 @@
             <field name="parent_id" ref="pgc_pymes_4039"/>
             <field name="type">payable</field>
             <field name="name">Proveedores, empresas del grupo, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_404" model="account.account.template">
             <field name="code">404</field>
@@ -3718,7 +3718,7 @@
             <field name="parent_id" ref="pgc_pymes_40"/>
             <field name="type">view</field>
             <field name="name">Proveedores, empresas asociadas</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_404_child" model="account.account.template">
             <field name="code">404</field>
@@ -3726,7 +3726,7 @@
             <field name="parent_id" ref="pgc_pymes_404"/>
             <field name="type">other</field>
             <field name="name">Proveedores, empresas asociadas</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_405" model="account.account.template">
             <field name="code">405</field>
@@ -3734,7 +3734,7 @@
             <field name="parent_id" ref="pgc_pymes_40"/>
             <field name="type">view</field>
             <field name="name">Proveedores, otras partes vinculadas</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_405_child" model="account.account.template">
             <field name="code">405</field>
@@ -3742,7 +3742,7 @@
             <field name="parent_id" ref="pgc_pymes_405"/>
             <field name="type">other</field>
             <field name="name">Proveedores, otras partes vinculadas</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_406" model="account.account.template">
             <field name="code">406</field>
@@ -3750,7 +3750,7 @@
             <field name="parent_id" ref="pgc_pymes_40"/>
             <field name="type">view</field>
             <field name="name">Envases y embalajes a devolver a proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_406_child" model="account.account.template">
             <field name="code">406</field>
@@ -3758,7 +3758,7 @@
             <field name="parent_id" ref="pgc_pymes_406"/>
             <field name="type">other</field>
             <field name="name">Envases y embalajes a devolver a proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_407" model="account.account.template">
             <field name="code">407</field>
@@ -3766,7 +3766,7 @@
             <field name="parent_id" ref="pgc_pymes_40"/>
             <field name="type">view</field>
             <field name="name">Anticipos a proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_407_child" model="account.account.template">
             <field name="code">407</field>
@@ -3774,7 +3774,7 @@
             <field name="parent_id" ref="pgc_pymes_407"/>
             <field name="type">other</field>
             <field name="name">Anticipos a proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_41" model="account.account.template">
             <field name="code">41</field>
@@ -3782,7 +3782,7 @@
             <field name="parent_id" ref="pgc_pymes_4"/>
             <field name="type">view</field>
             <field name="name">Acreedores varios</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_410" model="account.account.template">
             <field name="code">410</field>
@@ -3790,7 +3790,7 @@
             <field name="parent_id" ref="pgc_pymes_41"/>
             <field name="type">view</field>
             <field name="name">Acreedores por prestaciones de servicios</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4100" model="account.account.template">
             <field name="code">4100</field>
@@ -3798,7 +3798,7 @@
             <field name="parent_id" ref="pgc_pymes_410"/>
             <field name="type">view</field>
             <field name="name">Acreedores por prestaciones de servicios (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4100_child" model="account.account.template">
             <field name="code">4100</field>
@@ -3806,7 +3806,7 @@
             <field name="parent_id" ref="pgc_pymes_4100"/>
             <field name="type">payable</field>
             <field name="name">Acreedores por prestaciones de servicios (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4104" model="account.account.template">
             <field name="code">4104</field>
@@ -3814,7 +3814,7 @@
             <field name="parent_id" ref="pgc_pymes_410"/>
             <field name="type">view</field>
             <field name="name">Acreedores por prestaciones de servicios (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4104_child" model="account.account.template">
             <field name="code">4104</field>
@@ -3822,7 +3822,7 @@
             <field name="parent_id" ref="pgc_pymes_4104"/>
             <field name="type">payable</field>
             <field name="name">Acreedores por prestaciones de servicios (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4109" model="account.account.template">
             <field name="code">4109</field>
@@ -3830,7 +3830,7 @@
             <field name="parent_id" ref="pgc_pymes_410"/>
             <field name="type">view</field>
             <field name="name">Acreedores por prestaciones de servicios, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4109_child" model="account.account.template">
             <field name="code">4109</field>
@@ -3838,7 +3838,7 @@
             <field name="parent_id" ref="pgc_pymes_4109"/>
             <field name="type">payable</field>
             <field name="name">Acreedores por prestaciones de servicios, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_411" model="account.account.template">
             <field name="code">411</field>
@@ -3846,7 +3846,7 @@
             <field name="parent_id" ref="pgc_pymes_41"/>
             <field name="type">view</field>
             <field name="name">Acreedores, efectos comerciales a pagar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_411_child" model="account.account.template">
             <field name="code">411</field>
@@ -3854,7 +3854,7 @@
             <field name="parent_id" ref="pgc_pymes_411"/>
             <field name="type">other</field>
             <field name="name">Acreedores, efectos comerciales a pagar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_419" model="account.account.template">
             <field name="code">419</field>
@@ -3862,7 +3862,7 @@
             <field name="parent_id" ref="pgc_pymes_41"/>
             <field name="type">view</field>
             <field name="name">Acreedores por operaciones en común</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_419_child" model="account.account.template">
             <field name="code">419</field>
@@ -3870,7 +3870,7 @@
             <field name="parent_id" ref="pgc_pymes_419"/>
             <field name="type">other</field>
             <field name="name">Acreedores por operaciones en común</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_43" model="account.account.template">
             <field name="code">43</field>
@@ -3878,7 +3878,7 @@
             <field name="parent_id" ref="pgc_pymes_4"/>
             <field name="type">view</field>
             <field name="name">Clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_430" model="account.account.template">
             <field name="code">430</field>
@@ -3886,7 +3886,7 @@
             <field name="parent_id" ref="pgc_pymes_43"/>
             <field name="type">view</field>
             <field name="name">Clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4300" model="account.account.template">
             <field name="code">4300</field>
@@ -3894,7 +3894,7 @@
             <field name="parent_id" ref="pgc_pymes_430"/>
             <field name="type">view</field>
             <field name="name">Clientes (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4300_child" model="account.account.template">
             <field name="code">4300</field>
@@ -3902,7 +3902,7 @@
             <field name="parent_id" ref="pgc_pymes_4300"/>
             <field name="type">receivable</field>
             <field name="name">Clientes (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4304" model="account.account.template">
             <field name="code">4304</field>
@@ -3910,7 +3910,7 @@
             <field name="parent_id" ref="pgc_pymes_430"/>
             <field name="type">view</field>
             <field name="name">Clientes (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4304_child" model="account.account.template">
             <field name="code">4304</field>
@@ -3918,7 +3918,7 @@
             <field name="parent_id" ref="pgc_pymes_4304"/>
             <field name="type">receivable</field>
             <field name="name">Clientes (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4309" model="account.account.template">
             <field name="code">4309</field>
@@ -3926,7 +3926,7 @@
             <field name="parent_id" ref="pgc_pymes_430"/>
             <field name="type">view</field>
             <field name="name">Clientes, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4309_child" model="account.account.template">
             <field name="code">4309</field>
@@ -3934,7 +3934,7 @@
             <field name="parent_id" ref="pgc_pymes_4309"/>
             <field name="type">receivable</field>
             <field name="name">Clientes, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_431" model="account.account.template">
             <field name="code">431</field>
@@ -3942,7 +3942,7 @@
             <field name="parent_id" ref="pgc_pymes_43"/>
             <field name="type">view</field>
             <field name="name">Clientes, efectos comerciales a cobrar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4310" model="account.account.template">
             <field name="code">4310</field>
@@ -3950,7 +3950,7 @@
             <field name="parent_id" ref="pgc_pymes_431"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales en cartera</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4310_child" model="account.account.template">
             <field name="code">4310</field>
@@ -3958,7 +3958,7 @@
             <field name="parent_id" ref="pgc_pymes_4310"/>
             <field name="type">receivable</field>
             <field name="name">Efectos comerciales en cartera</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4311" model="account.account.template">
             <field name="code">4311</field>
@@ -3966,7 +3966,7 @@
             <field name="parent_id" ref="pgc_pymes_431"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales descontados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4311_child" model="account.account.template">
             <field name="code">4311</field>
@@ -3974,7 +3974,7 @@
             <field name="parent_id" ref="pgc_pymes_4311"/>
             <field name="type">receivable</field>
             <field name="name">Efectos comerciales descontados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4312" model="account.account.template">
             <field name="code">4312</field>
@@ -3982,7 +3982,7 @@
             <field name="parent_id" ref="pgc_pymes_431"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales en gestión de cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4312_child" model="account.account.template">
             <field name="code">4312</field>
@@ -3990,7 +3990,7 @@
             <field name="parent_id" ref="pgc_pymes_4312"/>
             <field name="type">receivable</field>
             <field name="name">Efectos comerciales en gestión de cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4315" model="account.account.template">
             <field name="code">4315</field>
@@ -3998,7 +3998,7 @@
             <field name="parent_id" ref="pgc_pymes_431"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales impagados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4315_child" model="account.account.template">
             <field name="code">4315</field>
@@ -4006,7 +4006,7 @@
             <field name="parent_id" ref="pgc_pymes_4315"/>
             <field name="type">receivable</field>
             <field name="name">Efectos comerciales impagados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_432" model="account.account.template">
             <field name="code">432</field>
@@ -4014,7 +4014,7 @@
             <field name="parent_id" ref="pgc_pymes_43"/>
             <field name="type">view</field>
             <field name="name">Clientes, operaciones de factoring</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_432_child" model="account.account.template">
             <field name="code">432</field>
@@ -4022,7 +4022,7 @@
             <field name="parent_id" ref="pgc_pymes_432"/>
             <field name="type">other</field>
             <field name="name">Clientes, operaciones de factoring</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_433" model="account.account.template">
             <field name="code">433</field>
@@ -4030,7 +4030,7 @@
             <field name="parent_id" ref="pgc_pymes_43"/>
             <field name="type">view</field>
             <field name="name">Clientes, empresas del grupo</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4330" model="account.account.template">
             <field name="code">4330</field>
@@ -4038,7 +4038,7 @@
             <field name="parent_id" ref="pgc_pymes_433"/>
             <field name="type">view</field>
             <field name="name">Clientes empresas del grupo (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4330_child" model="account.account.template">
             <field name="code">4330</field>
@@ -4046,7 +4046,7 @@
             <field name="parent_id" ref="pgc_pymes_4330"/>
             <field name="type">receivable</field>
             <field name="name">Clientes empresas del grupo (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4331" model="account.account.template">
             <field name="code">4331</field>
@@ -4054,7 +4054,7 @@
             <field name="parent_id" ref="pgc_pymes_433"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales a cobrar, empresas del grupo</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4331_child" model="account.account.template">
             <field name="code">4331</field>
@@ -4062,7 +4062,7 @@
             <field name="parent_id" ref="pgc_pymes_4331"/>
             <field name="type">receivable</field>
             <field name="name">Efectos comerciales a cobrar, empresas del grupo</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4332" model="account.account.template">
             <field name="code">4332</field>
@@ -4070,7 +4070,7 @@
             <field name="parent_id" ref="pgc_pymes_433"/>
             <field name="type">view</field>
             <field name="name">Clientes empresas del grupo, operaciones de factoring</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4332_child" model="account.account.template">
             <field name="code">4332</field>
@@ -4078,7 +4078,7 @@
             <field name="parent_id" ref="pgc_pymes_4332"/>
             <field name="type">receivable</field>
             <field name="name">Clientes empresas del grupo, operaciones de factoring</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4334" model="account.account.template">
             <field name="code">4334</field>
@@ -4086,7 +4086,7 @@
             <field name="parent_id" ref="pgc_pymes_433"/>
             <field name="type">view</field>
             <field name="name">Clientes empresas del grupo (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4334_child" model="account.account.template">
             <field name="code">4334</field>
@@ -4094,7 +4094,7 @@
             <field name="parent_id" ref="pgc_pymes_4334"/>
             <field name="type">receivable</field>
             <field name="name">Clientes empresas del grupo (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4336" model="account.account.template">
             <field name="code">4336</field>
@@ -4102,7 +4102,7 @@
             <field name="parent_id" ref="pgc_pymes_433"/>
             <field name="type">view</field>
             <field name="name">Clientes empresas del grupo de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4336_child" model="account.account.template">
             <field name="code">4336</field>
@@ -4110,7 +4110,7 @@
             <field name="parent_id" ref="pgc_pymes_4336"/>
             <field name="type">receivable</field>
             <field name="name">Clientes empresas del grupo de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4337" model="account.account.template">
             <field name="code">4337</field>
@@ -4118,7 +4118,7 @@
             <field name="parent_id" ref="pgc_pymes_433"/>
             <field name="type">view</field>
             <field name="name">Envases y embalajes a devolver a clientes, empresas del grupo</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4337_child" model="account.account.template">
             <field name="code">4337</field>
@@ -4126,7 +4126,7 @@
             <field name="parent_id" ref="pgc_pymes_4337"/>
             <field name="type">receivable</field>
             <field name="name">Envases y embalajes a devolver a clientes, empresas del grupo</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4339" model="account.account.template">
             <field name="code">4339</field>
@@ -4134,7 +4134,7 @@
             <field name="parent_id" ref="pgc_pymes_433"/>
             <field name="type">view</field>
             <field name="name">Clientes empresas del grupo, facturas pendientes de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4339_child" model="account.account.template">
             <field name="code">4339</field>
@@ -4142,7 +4142,7 @@
             <field name="parent_id" ref="pgc_pymes_4339"/>
             <field name="type">receivable</field>
             <field name="name">Clientes empresas del grupo, facturas pendientes de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_434" model="account.account.template">
             <field name="code">434</field>
@@ -4150,7 +4150,7 @@
             <field name="parent_id" ref="pgc_pymes_43"/>
             <field name="type">view</field>
             <field name="name">Clientes, empresas asociadas</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_434_child" model="account.account.template">
             <field name="code">434</field>
@@ -4158,7 +4158,7 @@
             <field name="parent_id" ref="pgc_pymes_434"/>
             <field name="type">other</field>
             <field name="name">Clientes, empresas asociadas</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_435" model="account.account.template">
             <field name="code">435</field>
@@ -4166,7 +4166,7 @@
             <field name="parent_id" ref="pgc_pymes_43"/>
             <field name="type">view</field>
             <field name="name">Clientes, otras partes vinculadas</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_435_child" model="account.account.template">
             <field name="code">435</field>
@@ -4174,7 +4174,7 @@
             <field name="parent_id" ref="pgc_pymes_435"/>
             <field name="type">other</field>
             <field name="name">Clientes, otras partes vinculadas</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_436" model="account.account.template">
             <field name="code">436</field>
@@ -4182,7 +4182,7 @@
             <field name="parent_id" ref="pgc_pymes_43"/>
             <field name="type">view</field>
             <field name="name">Clientes de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_436_child" model="account.account.template">
             <field name="code">436</field>
@@ -4190,7 +4190,7 @@
             <field name="parent_id" ref="pgc_pymes_436"/>
             <field name="type">other</field>
             <field name="name">Clientes de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_437" model="account.account.template">
             <field name="code">437</field>
@@ -4198,7 +4198,7 @@
             <field name="parent_id" ref="pgc_pymes_43"/>
             <field name="type">view</field>
             <field name="name">Envases y embalajes a devolver por clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_437_child" model="account.account.template">
             <field name="code">437</field>
@@ -4206,7 +4206,7 @@
             <field name="parent_id" ref="pgc_pymes_437"/>
             <field name="type">other</field>
             <field name="name">Envases y embalajes a devolver por clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_438" model="account.account.template">
             <field name="code">438</field>
@@ -4214,7 +4214,7 @@
             <field name="parent_id" ref="pgc_pymes_43"/>
             <field name="type">view</field>
             <field name="name">Anticipos de clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_438_child" model="account.account.template">
             <field name="code">438</field>
@@ -4222,7 +4222,7 @@
             <field name="parent_id" ref="pgc_pymes_438"/>
             <field name="type">other</field>
             <field name="name">Anticipos de clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_44" model="account.account.template">
             <field name="code">44</field>
@@ -4230,7 +4230,7 @@
             <field name="parent_id" ref="pgc_pymes_4"/>
             <field name="type">view</field>
             <field name="name">Deudores varios</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_440" model="account.account.template">
             <field name="code">440</field>
@@ -4238,7 +4238,7 @@
             <field name="parent_id" ref="pgc_pymes_44"/>
             <field name="type">view</field>
             <field name="name">Deudores</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4400" model="account.account.template">
             <field name="code">4400</field>
@@ -4246,7 +4246,7 @@
             <field name="parent_id" ref="pgc_pymes_440"/>
             <field name="type">view</field>
             <field name="name">Deudores (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4400_child" model="account.account.template">
             <field name="code">4400</field>
@@ -4254,7 +4254,7 @@
             <field name="parent_id" ref="pgc_pymes_4400"/>
             <field name="type">receivable</field>
             <field name="name">Deudores (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4404" model="account.account.template">
             <field name="code">4404</field>
@@ -4262,7 +4262,7 @@
             <field name="parent_id" ref="pgc_pymes_440"/>
             <field name="type">view</field>
             <field name="name">Deudores (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4404_child" model="account.account.template">
             <field name="code">4404</field>
@@ -4270,7 +4270,7 @@
             <field name="parent_id" ref="pgc_pymes_4404"/>
             <field name="type">receivable</field>
             <field name="name">Deudores (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4409" model="account.account.template">
             <field name="code">4409</field>
@@ -4278,7 +4278,7 @@
             <field name="parent_id" ref="pgc_pymes_440"/>
             <field name="type">view</field>
             <field name="name">Deudores, facturas pendientes de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4409_child" model="account.account.template">
             <field name="code">4409</field>
@@ -4286,7 +4286,7 @@
             <field name="parent_id" ref="pgc_pymes_4409"/>
             <field name="type">receivable</field>
             <field name="name">Deudores, facturas pendientes de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_441" model="account.account.template">
             <field name="code">441</field>
@@ -4294,7 +4294,7 @@
             <field name="parent_id" ref="pgc_pymes_44"/>
             <field name="type">view</field>
             <field name="name">Deudores, efectos comerciales a cobrar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4410" model="account.account.template">
             <field name="code">4410</field>
@@ -4302,7 +4302,7 @@
             <field name="parent_id" ref="pgc_pymes_441"/>
             <field name="type">view</field>
             <field name="name">Deudores, efectos comerciales en cartera</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4410_child" model="account.account.template">
             <field name="code">4410</field>
@@ -4310,7 +4310,7 @@
             <field name="parent_id" ref="pgc_pymes_4410"/>
             <field name="type">receivable</field>
             <field name="name">Deudores, efectos comerciales en cartera</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4411" model="account.account.template">
             <field name="code">4411</field>
@@ -4318,7 +4318,7 @@
             <field name="parent_id" ref="pgc_pymes_441"/>
             <field name="type">view</field>
             <field name="name">Deudores, efectos comerciales descontados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4411_child" model="account.account.template">
             <field name="code">4411</field>
@@ -4326,7 +4326,7 @@
             <field name="parent_id" ref="pgc_pymes_4411"/>
             <field name="type">receivable</field>
             <field name="name">Deudores, efectos comerciales descontados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4412" model="account.account.template">
             <field name="code">4412</field>
@@ -4334,7 +4334,7 @@
             <field name="parent_id" ref="pgc_pymes_441"/>
             <field name="type">view</field>
             <field name="name">Deudores, efectos comerciales en gestión de cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4412_child" model="account.account.template">
             <field name="code">4412</field>
@@ -4342,7 +4342,7 @@
             <field name="parent_id" ref="pgc_pymes_4412"/>
             <field name="type">receivable</field>
             <field name="name">Deudores, efectos comerciales en gestión de cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4415" model="account.account.template">
             <field name="code">4415</field>
@@ -4350,7 +4350,7 @@
             <field name="parent_id" ref="pgc_pymes_441"/>
             <field name="type">view</field>
             <field name="name">Deudores, efectos comerciales impagados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4415_child" model="account.account.template">
             <field name="code">4415</field>
@@ -4358,7 +4358,7 @@
             <field name="parent_id" ref="pgc_pymes_4415"/>
             <field name="type">receivable</field>
             <field name="name">Deudores, efectos comerciales impagados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_446" model="account.account.template">
             <field name="code">446</field>
@@ -4366,7 +4366,7 @@
             <field name="parent_id" ref="pgc_pymes_44"/>
             <field name="type">view</field>
             <field name="name">Deudores de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_446_child" model="account.account.template">
             <field name="code">446</field>
@@ -4374,7 +4374,7 @@
             <field name="parent_id" ref="pgc_pymes_446"/>
             <field name="type">other</field>
             <field name="name">Deudores de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_449" model="account.account.template">
             <field name="code">449</field>
@@ -4382,7 +4382,7 @@
             <field name="parent_id" ref="pgc_pymes_44"/>
             <field name="type">view</field>
             <field name="name">Deudores por operaciones en común</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_449_child" model="account.account.template">
             <field name="code">449</field>
@@ -4390,7 +4390,7 @@
             <field name="parent_id" ref="pgc_pymes_449"/>
             <field name="type">other</field>
             <field name="name">Deudores por operaciones en común</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_46" model="account.account.template">
             <field name="code">46</field>
@@ -4406,7 +4406,7 @@
             <field name="parent_id" ref="pgc_pymes_46"/>
             <field name="type">view</field>
             <field name="name">Anticipos de remuneraciones</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_460_child" model="account.account.template">
             <field name="code">460</field>
@@ -4414,7 +4414,7 @@
             <field name="parent_id" ref="pgc_pymes_460"/>
             <field name="type">other</field>
             <field name="name">Anticipos de remuneraciones</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_465" model="account.account.template">
             <field name="code">465</field>
@@ -4422,7 +4422,7 @@
             <field name="parent_id" ref="pgc_pymes_46"/>
             <field name="type">view</field>
             <field name="name">Remuneraciones pendientes de pago</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_465_child" model="account.account.template">
             <field name="code">465</field>
@@ -4430,7 +4430,7 @@
             <field name="parent_id" ref="pgc_pymes_465"/>
             <field name="type">other</field>
             <field name="name">Remuneraciones pendientes de pago</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_47" model="account.account.template">
             <field name="code">47</field>
@@ -4710,7 +4710,7 @@
             <field name="parent_id" ref="pgc_pymes_48"/>
             <field name="type">view</field>
             <field name="name">Gastos anticipados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_480_child" model="account.account.template">
             <field name="code">480</field>
@@ -4718,7 +4718,7 @@
             <field name="parent_id" ref="pgc_pymes_480"/>
             <field name="type">other</field>
             <field name="name">Gastos anticipados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_485" model="account.account.template">
             <field name="code">485</field>
@@ -4726,7 +4726,7 @@
             <field name="parent_id" ref="pgc_pymes_48"/>
             <field name="type">view</field>
             <field name="name">Ingresos anticipados</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_485_child" model="account.account.template">
             <field name="code">485</field>
@@ -4734,7 +4734,7 @@
             <field name="parent_id" ref="pgc_pymes_485"/>
             <field name="type">other</field>
             <field name="name">Ingresos anticipados</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_49" model="account.account.template">
             <field name="code">49</field>
diff --git a/addons/l10n_it/libroIVA.py b/addons/l10n_it/libroIVA.py
index 1805cd108bf..a78c81ffdb3 100755
--- a/addons/l10n_it/libroIVA.py
+++ b/addons/l10n_it/libroIVA.py
@@ -40,14 +40,14 @@ class l10n_chart_it_report_libroIVA (osv.osv):
 
     _columns = {
         'name': fields.char('Fiscal year',size=64),
-	'company_id': fields.many2one('res.company', 'Company'),
+        'company_id': fields.many2one('res.company', 'Company'),
     }
 
     def init (self, cr) :
         cr.execute("""DROP VIEW IF EXISTS account_report_libroiva""")
-	cr.execute("""
-		CREATE VIEW account_report_libroiva AS (
-			SELECT  id, name, company_id FROM account_fiscalyear
+        cr.execute("""
+                CREATE VIEW account_report_libroiva AS (
+                        SELECT  id, name, company_id FROM account_fiscalyear
         )""")
 l10n_chart_it_report_libroIVA()
 
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 76bcc4b92da..85063c1a335 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -18,11 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import time
-import ir
+
 import pooler
 from report.interface import report_rml
-from report.interface import toxml
+#from report.interface import toxml
 from tools import to_xml
 from report import report_sxw
 from datetime import datetime
@@ -52,7 +51,6 @@ class report_custom(report_rml):
             prod_name = bom['name']
             prod_qtty = factor * bom['product_qty']
             product_uom = product_uom_pool.browse(cr, uid, bom['product_uom'], context=context)
-            level = 1
             main_sp_price, main_sp_name , main_strd_price = '','',''
             sellers, sellers_price = '',''
 
diff --git a/addons/mrp_repair/wizard/make_invoice.py b/addons/mrp_repair/wizard/make_invoice.py
index 2cb6409348e..61f82a3d57c 100644
--- a/addons/mrp_repair/wizard/make_invoice.py
+++ b/addons/mrp_repair/wizard/make_invoice.py
@@ -27,7 +27,7 @@ class make_invoice(osv.osv_memory):
     _description = 'Make Invoice'
 
     _columns = {
-	   'group': fields.boolean('Group by partner invoice address'),
+           'group': fields.boolean('Group by partner invoice address'),
     }
 
     def make_invoices(self, cr, uid, ids, context=None):
diff --git a/addons/pad/web/editors.py b/addons/pad/web/editors.py
index b954967497c..e303dc4b3d7 100644
--- a/addons/pad/web/editors.py
+++ b/addons/pad/web/editors.py
@@ -14,7 +14,7 @@ class SidebarTemplateEditor(openobject.templating.TemplateEditor):
                 output.index(self.ADD_ATTACHMENT_BUTTON)) + 1
         output = output[:form_opener_insertion] + \
                  '''<a href="#" id="add-pad" class="button-a
-                 attachment-button">${_(" Add pad")}</a>\n''' + \
+                 attachment-button">${_("Write")}</a>\n''' + \
                  output[form_opener_insertion:]
         return output
 
diff --git a/addons/point_of_sale/report/pos_receipt_with_remboursment.py b/addons/point_of_sale/report/pos_receipt_with_remboursment.py
index 9b3dc529646..c600a9e2754 100644
--- a/addons/point_of_sale/report/pos_receipt_with_remboursment.py
+++ b/addons/point_of_sale/report/pos_receipt_with_remboursment.py
@@ -63,14 +63,19 @@ class order(report_sxw.rml_parse):
                     WHERE absl.pos_statement_id = %d"""%(order_id.id)
         self.cr.execute(sql)
         res = self.cr.fetchone()
-        lst.append(res[0])
+        if not res:
+            return ['', 0.0]
+        lst.append(res[0]) # todo: improve
         sql2 = """ select sum(absl.amount) as amt from account_bank_statement as abs
                     LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
                     LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
                     where aj.name = '%s' """%(res[0])
         self.cr.execute(sql2)
         res1 = self.cr.fetchone()
-        lst.append(res1[0])
+        if res1:
+            lst.append(res1[0])
+        else:
+            lst.append(0.0)
         return lst
 
 report_sxw.report_sxw('report.pos.receipt.with.remboursment', 'pos.order', 'addons/point_of_sale/report/pos_receipt_with_remboursment.rml', parser=order, header=False)
diff --git a/addons/point_of_sale/report/pos_receipt_without_remboursment.py b/addons/point_of_sale/report/pos_receipt_without_remboursment.py
index 72d227fbd52..d2fe0f1d542 100644
--- a/addons/point_of_sale/report/pos_receipt_without_remboursment.py
+++ b/addons/point_of_sale/report/pos_receipt_without_remboursment.py
@@ -63,14 +63,19 @@ class order(report_sxw.rml_parse):
                     WHERE absl.pos_statement_id = %d"""%(order_id.id)
         self.cr.execute(sql)
         res = self.cr.fetchone()
-        lst.append(res[0])
+        if not res:
+            return ['', 0.0]
+        lst.append(res[0]) # todo: improve
         sql2 = """ select sum(absl.amount) as amt from account_bank_statement as abs
                     LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
                     LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
                     where aj.name = '%s' """%(res[0])
         self.cr.execute(sql2)
         res1 = self.cr.fetchone()
-        lst.append(res1[0])
+        if res1:
+            lst.append(res1[0])
+        else:
+            lst.append(0.0)
         return lst
 
 report_sxw.report_sxw('report.pos.receipt.without.remboursment', 'pos.order', 'addons/point_of_sale/report/pos_receipt_without_remboursment.rml', parser=order, header=False)
diff --git a/addons/point_of_sale/wizard/pos_sales_user_today.py b/addons/point_of_sale/wizard/pos_sales_user_today.py
index d9dbc82d294..d07def08910 100644
--- a/addons/point_of_sale/wizard/pos_sales_user_today.py
+++ b/addons/point_of_sale/wizard/pos_sales_user_today.py
@@ -20,8 +20,6 @@
 ##############################################################################
 
 from osv import osv, fields
-from tools.translate import _
-
 
 class pos_sales_user_today(osv.osv_memory):
     _name = 'pos.sales.user.today'
diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
index 6c0d03e2ddb..6f68b63cc02 100644
--- a/addons/profile_tools/installer.py
+++ b/addons/profile_tools/installer.py
@@ -31,7 +31,7 @@ class misc_tools_installer(osv.osv_memory):
         'idea':fields.boolean('Ideas Box',help='Promote ideas of the employees, votes and discussion on best ideas.'),
         'share':fields.boolean('Web Share',help='Allows you to give restricted access to your OpenERP documents to external users, ' \
             'such as customers, suppliers, or accountants. You can share any OpenERP Menu such as your project tasks, support requests, invoices, etc.'),
-        'pad': fields.boolean('Native pad integration',
+        'pad': fields.boolean('Collaborative Note Pads',
             help="This module creates a tighter integration between a Pad "
                  "instance of your choosing and your OpenERP Web Client by "
                  "letting you easily link pads to OpenERP objects via "
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 4640ea8fa48..6c20603d08d 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -105,8 +105,8 @@ class project_phase(osv.osv):
 
     _columns = {
         'name': fields.char("Name", size=64, required=True),
-        'date_start': fields.date('Start Date', help="Starting Date of the phase", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'date_end': fields.date('End Date', help="Ending Date of the phase", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'date_start': fields.date('Start Date', help="It's computed according to the phases order : the start date of the 1st phase is set by you while the other start dates depend on the end date of their previous phases", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'date_end': fields.date('End Date', help=" It's computed by the scheduler according to the start date and the duration.", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'constraint_date_start': fields.date('Minimum Start Date', help='force the phase to start after this date', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'constraint_date_end': fields.date('Deadline', help='force the phase to finish before this date', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'project_id': fields.many2one('project.project', 'Project', required=True),
@@ -144,13 +144,6 @@ class project_phase(osv.osv):
             result['date_start'] = project_id.date_start
         return {'value': result}
 
-    def onchange_days(self, cr, uid, ids, project, context=None):
-        result = {}
-        for id in ids:
-            project_id = self.browse(cr, uid, id, context=context)
-            newdate = datetime.strptime(project_id.date_start, '%Y-%m-%d') + relativedelta(days=project_id.duration or 0.0)
-            result['date_end'] = newdate.strftime('%Y-%m-%d')
-        return {'value': result}
 
     def _check_date_start(self, cr, uid, phase, date_end, context=None):
        """
@@ -192,55 +185,6 @@ class project_phase(osv.osv):
        dt_end = work_times[-1][1].strftime('%Y-%m-%d')
        self.write(cr, uid, [phase.id], {'date_start': date_start.strftime('%Y-%m-%d'), 'date_end': dt_end}, context=context)
 
-    def write(self, cr, uid, ids, vals, context=None):
-        resource_calendar_obj = self.pool.get('resource.calendar')
-        resource_obj = self.pool.get('resource.resource')
-        uom_obj = self.pool.get('product.uom')
-        if context is None:
-            context = {}
-        res = super(project_phase, self).write(cr, uid, ids, vals, context=context)
-        if context.get('scheduler',False):
-            return res
-        # Consider calendar and efficiency if the phase is performed by a resource
-        # otherwise consider the project's working calendar
-
-        #TOCHECK : why need this ?
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        default_uom_id = self._get_default_uom_id(cr, uid)
-        for phase in self.browse(cr, uid, ids, context=context):
-            calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
-            resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)],context=context)
-            if resource_id:
-                cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id
-                if cal_id:
-                    calendar_id = cal_id
-
-            avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
-            # Change the date_start and date_end
-            # for previous and next phases respectively based on valid condition
-            if vals.get('date_start', False) and vals['date_start'] < phase.date_start:
-                dt_start = datetime.strptime(vals['date_start'], '%Y-%m-%d')
-                work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, dt_start, avg_hours or 0.0, resource_id and resource_id[0] or False)
-                if work_times:
-                    vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d')
-                for prv_phase in phase.previous_phase_ids:
-                    if prv_phase.id == phase.id:
-                        continue
-                    self._check_date_start(cr, uid, prv_phase, dt_start, context=context)
-
-            if vals.get('date_end', False) and vals['date_end'] > phase.date_end:
-                dt_end = datetime.strptime(vals['date_end'], '%Y-%m-%d')
-                work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, dt_end, avg_hours or 0.0, resource_id and resource_id[0] or False)
-                if work_times:
-                    vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d')
-                for next_phase in phase.next_phase_ids:
-                    if next_phase.id == phase.id:
-                        continue
-                    self._check_date_end(cr, uid, next_phase, dt_end, context=context)
-
-        return res
-
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
@@ -282,25 +226,29 @@ class project_phase(osv.osv):
             res[phase.id] = resource_objs
         return res
 
-    def generate_schedule(self, cr, uid, ids, start_date, calendar_id=False, context=None):
+    def generate_schedule(self, cr, uid, ids, start_date=False, calendar_id=False, context=None):
         """
         Schedule phase with the start date till all the next phases are completed.
-        @param: start_dsate : start date for the phase
+        @param: start_date (datetime.datetime) : start date for the phase. It would be either Start date of phase or start date of project or system current date
         @param: calendar_id : working calendar of the project
         """
         if context is None:
             context = {}
         resource_pool = self.pool.get('resource.resource')
+        data_pool = self.pool.get('ir.model.data')
         resource_allocation_pool = self.pool.get('project.resource.allocation')
         uom_pool = self.pool.get('product.uom')
-        default_uom_id = self._get_default_uom_id(cr, uid)
+        data_model, day_uom_id = data_pool.get_object_reference(cr, uid, 'product', 'uom_day')
         for phase in self.browse(cr, uid, ids, context=context):
             if not phase.responsible_id:
                 raise osv.except_osv(_('No responsible person assigned !'),_("You must assign a responsible person for phase '%s' !") % (phase.name,))
 
+            if not start_date:
+                start_date = phase.project_id.date_start or phase.date_start or datetime.now().strftime("%Y-%m-%d")
+                start_date = datetime.strftime((datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d") 
             phase_resource_obj = resource_pool.generate_resources(cr, uid, [phase.responsible_id.id], calendar_id, context=context)
-            avg_hours = uom_pool._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
-            duration = str(avg_hours) + 'H'
+            avg_days = uom_pool._compute_qty(cr, uid, phase.product_uom.id, phase.duration, day_uom_id)
+            duration = str(avg_days) + 'd'
             # Create a new project for each phase
             def Project():
                 # If project has working calendar then that
@@ -308,14 +256,17 @@ class project_phase(osv.osv):
                 start = start_date
                 minimum_time_unit = 1
                 resource = phase_resource_obj
+                working_hours_per_day = 24
+                vacation = []
                 if calendar_id:
-                    working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
+                    working_hours_per_day = 8 #TODO: it should be come from calendars
                     vacation = tuple(resource_pool.compute_vacation(cr, uid, calendar_id))
-
+                working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
                 def phase():
                     effort = duration
 
             project = Task.BalancedProject(Project)
+
             s_date = project.phase.start.to_datetime()
             e_date = project.phase.end.to_datetime()
             # Recalculate date_start and date_end
@@ -440,12 +391,9 @@ class project(osv.osv):
                                                   ('state', 'in', ['draft', 'open', 'pending']),
                                                   ('previous_phase_ids', '=', False)
                                                   ])
-            start_date = project.date_start
-            if not start_date:
-                start_date = datetime.now().strftime("%Y-%m-%d")
-            start_dt = datetime.strftime((datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d %H:%M")
             calendar_id = project.resource_calendar_id and project.resource_calendar_id.id or False
-            phase_pool.generate_schedule(cr, uid, phase_ids, start_dt, calendar_id, context=context)
+            start_date = False
+            phase_pool.generate_schedule(cr, uid, phase_ids, start_date, calendar_id, context=context)
         return True
 
     def schedule_tasks(self, cr, uid, ids, context=None):
@@ -507,6 +455,7 @@ class project_task(osv.osv):
         """
         Schedule the tasks according to resource available and priority.
         """
+        resource_pool = self.pool.get('resource.resource')
         if not ids:
             return False
         if context is None:
@@ -535,11 +484,14 @@ class project_task(osv.osv):
             try:
                 resource = reduce(operator.or_, resources)
             except:
-                raise osv.except_osv(_('Error'), _('Should have Resources Allocation or Project Members!'))
+                raise osv.except_osv(_('Error'), _('Resources should be allocated to your phases and Members should be assigned to your Project!'))
             minimum_time_unit = 1
-            if calendar_id:            # If project has working calendar
-                working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
+            working_hours_per_day = 24
+            vacation = []
+            if calendar_id:
+                working_hours_per_day = 8 #TODO: it should be come from calendars
                 vacation = tuple(resource_pool.compute_vacation(cr, uid, calendar_id, context=context))
+            working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
             # Dynamic creation of tasks
             task_number = 0
             for openobect_task in self.browse(cr, uid, ids, context=context):
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 37813f84946..e7f63008585 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -117,7 +117,7 @@
                         </group>
                         <group colspan="6" col="6">
                             <field name="date_start"/>
-                            <field name="duration"  on_change="onchange_days(project_id)" />
+                            <field name="duration"/>
                             <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/>
                             <field name="date_end"/>
                         </group>
@@ -135,7 +135,7 @@
                                     <field name="resource_id" context="{'project_id':parent.project_id}"/>
                                     <field name="date_start"/>
                                     <field name="date_end"/>
-                                    <field name="useability"/>
+                                    <field name="useability" string="Availability"/>
                                   </form>
                              </field>
                             <separator string="" colspan="4"/>
@@ -148,15 +148,17 @@
                                 <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
                             </group>
                         </page>
-                        <page string="Task Detail">
-                            <field colspan="4" name="task_ids" context="{'default_project_id' :project_id}" nolabel="1">
-                                 <tree editable="bottom" string="Project's Tasks">
+                        <page string="Tasks Details">
+                            <field colspan="4" name="task_ids" readonly="1" context="{'default_project_id' :project_id}" nolabel="1">
+                                 <tree string="Project's Tasks">
                                     <field name="sequence"/>
                                     <field name="name"/>
                                     <field name="user_id"/>
                                     <field name="planned_hours" widget="float_time"/>
                                     <field name="project_id" invisible="1"/>
                                     <field name="total_hours" sum='Total Hours'/>
+                                    <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
+                                    <field name="state"/>
                                   </tree>
                                   <form string="Project's Tasks">
                                       <notebook colspan="4">
@@ -165,6 +167,7 @@
                                                 <field name="name"/>
                                                 <field name="project_id"/>
                                                 <field name="user_id"/>
+                                                <field name="sequence"/>
                                             </group>
                                             <group colspan="2" col="2">
                                                   <separator string="Dates" colspan="2"/>
@@ -175,7 +178,7 @@
                                                   <separator string="Planning" colspan="2"/>
                                                   <field name="planned_hours" widget="float_time"/>
                                                 <field name="total_hours" widget="float_time"/>
-                                                <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
+                                                <field name="remaining_hours" widget="float_time"/>
                                                 <field name="effective_hours" invisible="1"/>
                                             </group>
                                             <group colspan="6" col="4">
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py
index 351297384fd..c07f1ae81be 100644
--- a/addons/project_long_term/wizard/project_compute_phases.py
+++ b/addons/project_long_term/wizard/project_compute_phases.py
@@ -65,10 +65,11 @@ class project_compute_phases(osv.osv_memory):
             context = {}
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
-        result = mod_obj._get_id(cr, uid, 'project_long_term', 'act_project_phase_list')
+        result = mod_obj._get_id(cr, uid, 'project_long_term', 'act_project_phase')
         id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
         result = act_obj.read(cr, uid, [id], context=context)[0]
-        result['context'] = {"search_default_project_id":data['project_id'], "search_default_responsible_id":uid, "search_default_current": 1}
+        result['target'] = 'current'
+        result['context'] = {"search_default_project_id":data['project_id'], "default_project_id":data['project_id'], "search_default_responsible_id":uid, "search_default_current": 1}
         return result
 
 project_compute_phases()
diff --git a/addons/project_long_term/wizard/project_compute_tasks.py b/addons/project_long_term/wizard/project_compute_tasks.py
index 0d5fa22e6a8..658350a27d2 100644
--- a/addons/project_long_term/wizard/project_compute_tasks.py
+++ b/addons/project_long_term/wizard/project_compute_tasks.py
@@ -50,13 +50,13 @@ class project_compute_tasks(osv.osv_memory):
             context = {}
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
-        result = mod_obj._get_id(cr, uid, 'project', 'action_view_task')
+        result = mod_obj._get_id(cr, uid, 'project_long_term', 'act_resouce_allocation')
         id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
         result = {}
         if not id:
             return result
         result = act_obj.read(cr, uid, [id], context=context)[0]
-        result['context'] = {"search_default_project_id":data['project_id'], "search_default_user_id":uid, "search_default_current": 1}
+        result['target'] = 'current'
         return result
 
 project_compute_tasks()
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 9270b5c5047..8d33e7c1549 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -290,10 +290,11 @@
             <field name="context">{'search_default_draft': 1}</field>
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
-            <field name="help">With the Requests for Quotation menu you can create new requests for quotations, review existing ones or turn them into a purchase order once the supplier offer is approved. When you confirm a RfQ, OpenERP will convert it to a Purchase Order and generate the next steps: draft reception of the products, draft invoice to control.</field>
+            <field name="help">You can create a request for quotation when you want to buy products to a supplier but the purchase is not confirmed yet. Use also this menu to review requests for quotation created automatically based on your logistic rules (minimum stock, MTO, etc). You can convert the request for quotation into a purchase order once the order is confirmed. If you use the extended interface (from user's preferences), you can select the way to control your supplier invoices: based on the order, based on the receptions or manual encoding.</field>
         </record>
-        <menuitem action="purchase_rfq" id="menu_purchase_rfq" parent="menu_procurement_management"
-                sequence="6"/>
+        <menuitem action="purchase_rfq" id="menu_purchase_rfq" 
+            parent="menu_procurement_management"
+            sequence="6"/>
 
         <record id="purchase_form_action" model="ir.actions.act_window">
             <field name="name">Purchase Orders</field>
@@ -302,8 +303,7 @@
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="context">{'search_default_approved': 1,'search_default_create_uid':uid}</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
-            <field name="help">From the Purchase Orders menu, you can track the status of your orders: products received, invoice received and controlled.
-</field>
+            <field name="help">Use this menu to search within your purchase orders by references, supplier, products, etc. For each purchase order, you can track the products received, and control the supplier invoices.</field>
         </record>
         <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management" />
 
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index 332c892a19d..6b68cecf1a5 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -103,9 +103,10 @@ class purchase_report(osv.osv):
                     extract(epoch from age(l.date_planned,s.date_order))/(24*60*60)::decimal(16,2) as delay_pass,
                     count(*) as nbr,
                     (l.price_unit*l.product_qty*u.factor)::decimal(16,2) as price_total,
-                    avg(100.0 * (l.price_unit*l.product_qty*u.factor)/(nullif(t.standard_price*l.product_qty*u.factor,0)))::decimal(16,2) as negociation,
+                    avg(100.0 * (l.price_unit*l.product_qty*u.factor) / NULLIF(t.standard_price*l.product_qty*u.factor, 0.0))::decimal(16,2) as negociation,
+
                     sum(t.standard_price*l.product_qty*u.factor)::decimal(16,2) as price_standard,
-                    (sum(l.product_qty*l.price_unit)/sum(nullif(l.product_qty*u.factor,0)))::decimal(16,2) as price_average
+                    (sum(l.product_qty*l.price_unit)/NULLIF(sum(l.product_qty*u.factor),0.0))::decimal(16,2) as price_average
                 from purchase_order s
                     left join purchase_order_line l on (s.id=l.order_id)
                         left join product_product p on (l.product_id=p.id)
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 19ece464eaf..30def0c2e16 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -229,7 +229,7 @@ class resource_resource(osv.osv):
         'resource_type': fields.selection([('user','Human'),('material','Material')], 'Resource Type', required=True),
         'user_id' : fields.many2one('res.users', 'User', help='Related user name for the resource to manage its access.'),
         'time_efficiency' : fields.float('Efficiency factor', size=8, required=True, help="This field depict the efficiency of the resource to complete tasks. e.g  resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficency of 200%, then his load will only be 50%."),
-        'calendar_id' : fields.many2one("resource.calendar", "Working time", help="Define the schedule of resource"),
+        'calendar_id' : fields.many2one("resource.calendar", "Working Period", help="Define the schedule of resource"),
     }
     _defaults = {
         'resource_type' : 'user',
@@ -299,11 +299,15 @@ class resource_resource(osv.osv):
             leave_list.sort()
         return leave_list
 
-    def compute_working_calendar(cr, uid, calendar_id, context=None):
+    def compute_working_calendar(self, cr, uid, calendar_id=False, context=None):
         """
         Change the format of working calendar from 'Openerp' format to bring it into 'Faces' format.
         @param calendar_id : working calendar of the project
         """
+        if not calendar_id:
+            # Calendar is not specified: working days: 24/7
+            return [('fri', '1:0-12:0','12:0-24:0'), ('thu', '1:0-12:0','12:0-24:0'), ('wed', '1:0-12:0','12:0-24:0'), 
+                   ('mon', '1:0-12:0','12:0-24:0'), ('tue', '1:0-12:0','12:0-24:0'), ('sat', '1:0-12:0','12:0-24:0'), ('sun', '1:0-12:0','12:0-24:0')]
         resource_attendance_pool = self.pool.get('resource.calendar.attendance')
         time_range = "8:00-8:00"
         non_working = ""
@@ -321,8 +325,8 @@ class resource_resource(osv.osv):
             if week_days.has_key(week['dayofweek']):
                 day = week_days[week['dayofweek']]
                 wk_days[week['dayofweek']] = week_days[week['dayofweek']]
-            hour_from_str = convert_timeformat(cr, uid, week['hour_from'])
-            hour_to_str = convert_timeformat(cr, uid, week['hour_to'])
+            hour_from_str = convert_timeformat(week['hour_from'])
+            hour_to_str = convert_timeformat(week['hour_to'])
             res_str = hour_from_str + '-' + hour_to_str
             wktime_list.append((day, res_str))
         # Convert into format like [('mon', '8:00-12:00', '13:00-18:00')]
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 61b14c3614d..2d5fdf8e4ed 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -26,7 +26,7 @@
                         <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <separator orientation="vertical" />
-                        <filter string="Working Time" icon="terp-go-today" domain="[]" context="{'group_by':'calendar_id'}"/>
+                        <filter string="Working Period" icon="terp-go-today" domain="[]" context="{'group_by':'calendar_id'}"/>
                     </group>
                </search>
             </field>
@@ -57,7 +57,7 @@
                        <field name="name" string="Reason"/>
                        <field name="resource_id" string="Resource"/>
                        <field name="company_id" string="Company" widget="selection" groups="base.group_multi_company"/>
-                       <field name="calendar_id" string="Working Time" widget="selection"/>
+                       <field name="calendar_id" string="Working Period" widget="selection"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
@@ -179,7 +179,7 @@
                    </group>
                    <notebook colspan="4">
                      <page string="General Information">
-                       <field name="calendar_id" widget="selection"/>
+                       <field name="calendar_id" />
                        <field name="time_efficiency" groups="base.group_extended"/>
                      </page>
 	           </notebook>
@@ -197,7 +197,7 @@
                     <field name="user_id" />
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="resource_type" />
-                    <field name="calendar_id" />
+                    <field name="calendar_id" string="Working Period"/>
                     <field name="time_efficiency" groups="base.group_extended"/>
                 </tree>
             </field>
@@ -225,7 +225,7 @@
                        </group>
                        <group colspan="2" col="2">
                            <field name="date_from"/>
-                           <field name="calendar_id"/>
+                           <field name="calendar_id" string="Working Period"/>
                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                        </group>
                        <group colspan="2" col="2">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 07148fd4100..86135e8f13d 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -252,6 +252,7 @@
         <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="3"/>
         <menuitem action="action_tracking_form" id="menu_action_tracking_form"
             groups="base.group_extended"
+            sequence="6"
             parent="menu_traceability"/>
 
         <record id="lot_line_tree" model="ir.ui.view">
@@ -407,9 +408,11 @@
             <field name="view_id" ref="view_production_lot_tree"/>
             <field name="search_view_id" ref="search_product_lot_filter" />
             <field name="context">{'full':'1',"search_default_available":1}</field>
-            <field name="help">This is the list of all the production lots (serial numbers) you recorded. When you select a lot, you can get the upstream or downstream traceability of the products contained in lot.</field>
+            <field name="help">This is the list of all the production lots (serial numbers) you recorded. When you select a lot, you can get the upstream or downstream traceability of the products contained in lot. By default, the list is filtred on the serial numbers that are available in your warehouse but you can uncheck the 'Available' button to get all the lots you produced, received or delivered to customers.</field>
         </record>
-        <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability" groups="base.group_extended"/>
+        <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" 
+            parent="menu_traceability" groups="base.group_extended"
+            sequence="1"/>
 
         #
         # Lot composition (history)
@@ -833,7 +836,7 @@
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Outgoing Deliveries">
+                <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Delivery Orders">
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="origin"/>
@@ -852,7 +855,7 @@
             <field name="model">stock.picking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Outgoing Deliveries">
+                <form string="Delivery Orders">
                     <group col="6" colspan="4">
                         <group colspan="4" col="4">
                             <field name="name" readonly="1"/>
@@ -990,13 +993,13 @@
             <field name="arch" type="xml">
                 <search string="Picking list">
                     <group col="8" colspan="4">
-                        <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Outgoing Deliveries"/>
-                        <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Deliveries"/>
-                        <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Outgoing Deliveries already processed"/>
+                        <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
+                        <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
+                        <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Outgoing Deliveries to invoice"/>
+                        <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="partner_id" />
@@ -1020,7 +1023,7 @@
         </record>
 
         <record id="action_picking_tree" model="ir.actions.act_window">
-            <field name="name">Outgoing Deliveries</field>
+            <field name="name">Delivery Orders</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1504,7 +1507,7 @@
             <field name="context">{'search_default_Available':1}</field>
             <field name="help">This menu gives you the full traceability of inventory operations on a specific product. You can filter on the product to see all the past or future movements for the product.</field>
         </record>
-        <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="1"/>
+        <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="3"/>
 
         ====================================
         Reception Picking (By Stock Move)
@@ -1863,7 +1866,7 @@
             <field name="view_id" ref="view_move_tree_reception_picking"/>
             <field name="context" eval="'{\'search_default_receive\':1, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_stock'),ref('stock_location_customers'))"/>
             <field name="search_view_id" ref="view_move_search_reception_outcoming_picking"/>
-            <field name="help">The Deliver Products menu lists all individual products you have to deliver to your customers. You can process the deliveries directly from this list, line by or line or through the Delivery Orders menu.</field>
+            <field name="help">You will find in this list all products you have to deliver to your customers. You can process the deliveries directly from this list using the buttons on the right of each line. You can filter the products to deliver by customer, products or sale order (using the Origin field).</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_move_out_picking_tree">
diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index f171eb428b3..a12cac7f639 100644
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -317,7 +317,6 @@ class survey_analysis(report_rml):
                                     rating_weight_sum += int(col_weight[1]) * tot_res
                                     tot_per = round((float(tot_res) * 100) / int(res_count), 2)
                                 else:
-                                    tor_res = 0
                                     tot_per = 0.0
                                 if tot_res:
                                     rml += """<td><para style="answer_bold">""" + tools.ustr(tot_per) + "%(" + tools.ustr(tot_res) + """)</para></td>"""
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index 282fea1832f..ba34b9c33e9 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -198,7 +198,6 @@ class survey_browse_response(report_rml):
 
         surv_resp_line_obj = pooler.get_pool(cr.dbname).get('survey.response.line')
         surv_obj = pooler.get_pool(cr.dbname).get('survey')
-        surv_ans_obj = pooler.get_pool(cr.dbname).get('survey.answer')
 
         for response in surv_resp_obj.browse(cr, uid, response_id):
             for survey in surv_obj.browse(cr, uid, [response.survey_id.id]):
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 646f1d30f98..ab8d50323d9 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -271,10 +271,10 @@
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
-	                   <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'responsible_id'}"/>
+                       <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'responsible_id'}"/>
                         <separator orientation="vertical"/>
-	                   <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'type'}"/>
-	                   <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
+                       <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'type'}"/>
+                       <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
                    </group>
                </search>
             </field>
@@ -287,6 +287,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="survey_tree"></field>
             <field name="search_view_id" ref="survey_search"/>
+            <field name="help">You can create survey for different purposes: recruitment interviews, employee's periodical evaluations, marketing campaigns, etc. A survey is made of pages containing questions of several types: text, multiple choices, etc. You can edit survey manually or click on the 'Edit Survey' for a WYSIWYG interface.</field>
         </record>
 
 
@@ -1104,11 +1105,11 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
-	                    <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-	                    <filter string="Survey" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'survey_id'}"/>
+                        <filter string="Survey" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'survey_id'}"/>
                         <separator orientation="vertical"/>
-	                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 90d702f13ed..23315d51c65 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -65,7 +65,10 @@ class survey_question_wiz(osv.osv_memory):
             context = {}
         if view_type in ['form']:
             wiz_id = 0
-            if not context.has_key('sur_name_id'):
+            sur_name_rec = None
+            if 'sur_name_id' in context:
+                sur_name_rec = surv_name_wiz.browse(cr, uid, context['sur_name_id'], context=context)
+            elif 'survey_id' in context:
                 res_data = {
                     'survey_id': context.get('survey_id', False),
                     'page_no': -1,
@@ -76,16 +79,14 @@ class survey_question_wiz(osv.osv_memory):
                 wiz_id = surv_name_wiz.create(cr, uid, res_data)
                 sur_name_rec = surv_name_wiz.browse(cr, uid, wiz_id, context=context)
                 context.update({'sur_name_id' :wiz_id})
-            else:
-                sur_name_rec = surv_name_wiz.browse(cr, uid, context['sur_name_id'], context=context)
-
+  
             if context.has_key('active_id'):
                 context.pop('active_id')
 
             survey_id = context.get('survey_id', False)
             if not survey_id:
                 # Try one more time to find it
-                if sur_name_rec.survey_id:
+                if sur_name_rec and sur_name_rec.survey_id:
                     survey_id = sur_name_rec.survey_id[0]
                 else:
                     # raise osv.except_osv(_('Error!'), _("Cannot locate survey for the question wizard!"))